summaryrefslogtreecommitdiffstats
path: root/gui/ConsoleWindow.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-06 02:52:51 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-06 02:52:51 +0100
commitfcb8612c10ae1bb1d2d8883a762979e9bca1f31e (patch)
tree3e266be991e61deb85c0118c2d0c10528d2c60ee /gui/ConsoleWindow.h
parentddb961fad5532a33bbd3771fbac840a1d9450d06 (diff)
downloadMultiMC-fcb8612c10ae1bb1d2d8883a762979e9bca1f31e.tar
MultiMC-fcb8612c10ae1bb1d2d8883a762979e9bca1f31e.tar.gz
MultiMC-fcb8612c10ae1bb1d2d8883a762979e9bca1f31e.tar.lz
MultiMC-fcb8612c10ae1bb1d2d8883a762979e9bca1f31e.tar.xz
MultiMC-fcb8612c10ae1bb1d2d8883a762979e9bca1f31e.zip
Implement console window tray icon, console window hiding, better scrolling
Diffstat (limited to 'gui/ConsoleWindow.h')
-rw-r--r--gui/ConsoleWindow.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/gui/ConsoleWindow.h b/gui/ConsoleWindow.h
index 731c616c..9291320e 100644
--- a/gui/ConsoleWindow.h
+++ b/gui/ConsoleWindow.h
@@ -16,6 +16,7 @@
#pragma once
#include <QMainWindow>
+#include <QSystemTrayIcon>
#include "logic/MinecraftProcess.h"
namespace Ui
@@ -77,7 +78,8 @@ slots:
// failures)
void on_btnPaste_clicked();
-
+ void iconActivated(QSystemTrayIcon::ActivationReason);
+ void toggleConsole();
protected:
void closeEvent(QCloseEvent *);
@@ -87,4 +89,6 @@ private:
bool m_mayclose = true;
int m_last_scroll_value = 0;
bool m_scroll_active = true;
+ QSystemTrayIcon *m_trayIcon = nullptr;
+ int m_saved_offset = 0;
};