diff options
| -rw-r--r-- | kteatime/toplevel.cpp | 24 | ||||
| -rw-r--r-- | kteatime/toplevel.h | 4 |
2 files changed, 22 insertions, 6 deletions
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp index 6b43fa4..1980eb3 100644 --- a/kteatime/toplevel.cpp +++ b/kteatime/toplevel.cpp @@ -171,10 +171,10 @@ TopLevel::TopLevel() : KSystemTray() action = config->readEntry("Action"); useTrayVis = config->readBoolEntry("UseTrayVis", true); - mugPixmap = loadSizedIcon("mug", width()); - teaNotReadyPixmap = loadSizedIcon("tea_not_ready", width()); - teaAnim1Pixmap = loadSizedIcon("tea_anim1", width()); - teaAnim2Pixmap = loadSizedIcon("tea_anim2", width()); + mugPixmap = loadIcon("mug"); + teaNotReadyPixmap = loadIcon("tea_not_ready"); + teaAnim1Pixmap = loadIcon("tea_anim1"); + teaAnim2Pixmap = loadIcon("tea_anim2"); confdlg = 0L; anondlg = 0L; @@ -201,8 +201,8 @@ TopLevel::~TopLevel() // FIXME: must delete more (like all the TQWidgets in config-window)? } -void TopLevel::resizeEvent ( TQResizeEvent * ) -{ +void TopLevel::resizeTrayIcon () { + // Honor Free Desktop specifications that allow for arbitrary system tray icon sizes mugPixmap = loadSizedIcon("mug", width()); teaNotReadyPixmap = loadSizedIcon("tea_not_ready", width()); teaAnim1Pixmap = loadSizedIcon("tea_anim1", width()); @@ -210,6 +210,18 @@ void TopLevel::resizeEvent ( TQResizeEvent * ) repaint(); } +void TopLevel::resizeEvent ( TQResizeEvent * ) +{ + // Honor Free Desktop specifications that allow for arbitrary system tray icon sizes + resizeTrayIcon(); +} + +void TopLevel::showEvent ( TQShowEvent * ) +{ + // Honor Free Desktop specifications that allow for arbitrary system tray icon sizes + resizeTrayIcon(); +} + /** Handle mousePressEvent */ void TopLevel::mousePressEvent(TQMouseEvent *event) { diff --git a/kteatime/toplevel.h b/kteatime/toplevel.h index 45567e5..02d8c20 100644 --- a/kteatime/toplevel.h +++ b/kteatime/toplevel.h @@ -56,6 +56,7 @@ protected: void mousePressEvent(TQMouseEvent *); void timerEvent(TQTimerEvent *); void resizeEvent(TQResizeEvent *); + void showEvent(TQShowEvent *); private slots: @@ -84,6 +85,9 @@ private slots: void actionEnableToggled(bool on); private: + void resizeTrayIcon(); + +private: static const int DEFAULT_TEA_TIME; |