[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/krdc
From:       Tony Murray <murraytony () gmail ! com>
Date:       2010-12-23 1:33:54
Message-ID: 20101223013354.E47E53E1F2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1208751 by murrant:

Change floating toolbar so it waits for a resize event to show itself upon creation.
We no longer need to check if we are fullscreen.  This could probably use some \
improving...


 M  +2 -8      floatingtoolbar.cpp  
 M  +0 -2      mainwindow.cpp  


--- trunk/KDE/kdenetwork/krdc/floatingtoolbar.cpp #1208750:1208751
@@ -63,7 +63,8 @@
             , visible(false)
             , sticky(false)
             , opacity(toolBarOpacity)
-            , queuedShow(false) {
+            // set queuedShow to true so we show the toolbar if we get a resize \
event on the anchorWidget +            , queuedShow(true) {
     }
 
     // rebuild contents and reposition then widget
@@ -146,13 +147,6 @@
 
 void FloatingToolBar::showAndAnimate()
 {
-    QDesktopWidget *desktop = QApplication::desktop();
-    int currentScreen = desktop->screenNumber(d->anchorWidget);
-    if ((d->anchorWidget->size() != desktop->screenGeometry(currentScreen).size())) \
                {
-        kDebug(5010) << "anchorWidget not fullscreen yet";
-        d->queuedShow = true;
-        return;
-    }
     if (d->animState == Showing)
         return;
 
--- trunk/KDE/kdenetwork/krdc/mainwindow.cpp #1208750:1208751
@@ -852,8 +852,6 @@
 
         m_toolBar->addWidget(buttonBox);
     }
-
-    m_toolBar->showAndAnimate();
 }
 
 void setActionStatus(QAction* action, bool enabled, bool visible, bool checked)


[prev in list] [next in list] [prev in thread] [next in thread]