Avoid excessively long Klipper startup time due to oversized tray icon creation when icon widget has not yet been shown

11 years ago · 745063fab8
parent 6ee99456cc
commit 745063fab8
1 changed files with 12 additions and 3 deletions
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@ -198,12 +198,21 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )

    if ( isApplet() ) {
        m_pixmap = KSystemTray::loadIcon( "klipper" );
+        m_iconOrigWidth = width();
+        m_iconOrigHeight = height();
    }
    else {
-        m_pixmap = KSystemTray::loadSizedIcon( "klipper", width() );
+        if (isShown()) {
+            m_pixmap = KSystemTray::loadSizedIcon( "klipper", width() );
+            m_iconOrigWidth = width();
+            m_iconOrigHeight = height();
+        }
+        else {
+            m_pixmap = KSystemTray::loadIcon( "klipper" );
+            m_iconOrigWidth = m_pixmap.width();
+            m_iconOrigHeight = m_pixmap,height();
+        }
    }
-    m_iconOrigWidth = width();
-    m_iconOrigHeight = height();
    adjustSize();

    globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));