From 745063fab8573daad8f3a174809c2da5d98f4fa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 8 Jul 2014 08:27:10 -0500 Subject: Avoid excessively long Klipper startup time due to oversized tray icon creation when icon widget has not yet been shown --- klipper/toplevel.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'klipper') diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index b30d551c1..ba4b255b6 100644 --- 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)); -- cgit v1.2.1