summaryrefslogtreecommitdiffstats
path: root/amarok/src/systray.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'amarok/src/systray.cpp')
-rw-r--r--amarok/src/systray.cpp18
1 files changed, 14 insertions, 4 deletions
diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp
index 7c6721e6..4b2f44b9 100644
--- a/amarok/src/systray.cpp
+++ b/amarok/src/systray.cpp
@@ -55,9 +55,9 @@ Amarok::TrayIcon::TrayIcon( TQWidget *playerWidget )
quit->disconnect();
connect( quit, TQT_SIGNAL(activated()), kapp, TQT_SLOT(quit()) );
- baseIcon = KSystemTray::loadSizedIcon( "amarok", width() );
- playOverlay = Amarok::loadOverlay( "play", width() );
- pauseOverlay = Amarok::loadOverlay( "pause", width() );
+ baseIcon = KSystemTray::loadIcon( "amarok" );
+ playOverlay = Amarok::loadOverlay( "play", baseIcon.width() );
+ pauseOverlay = Amarok::loadOverlay( "pause", baseIcon.width() );
overlayVisible = false;
//paintIcon();
@@ -102,7 +102,7 @@ Amarok::TrayIcon::event( TQEvent *e )
}
}
-void Amarok::TrayIcon::resizeEvent ( TQResizeEvent * )
+void Amarok::TrayIcon::resizeTrayIcon ()
{
// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
baseIcon = KSystemTray::loadSizedIcon( "amarok", width() );
@@ -121,6 +121,16 @@ void Amarok::TrayIcon::resizeEvent ( TQResizeEvent * )
paintIcon( -1, true );
}
+void Amarok::TrayIcon::resizeEvent ( TQResizeEvent * )
+{
+ resizeTrayIcon();
+}
+
+void Amarok::TrayIcon::showEvent ( TQShowEvent * )
+{
+ resizeTrayIcon();
+}
+
void
Amarok::TrayIcon::engineStateChanged( Engine::State state, Engine::State /*oldState*/ )
{