summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-08-17 19:37:17 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-08-17 19:37:17 +0900
commit229b6440dd12f3fb4595ef043557015c893f4f19 (patch)
tree7010849900c54b45d3be19613de83f8a66379199
parent30993d4f69166ef88a31a1b9bd394b0b7512cbaf (diff)
parenta6da78df3a5f895c014fdc52bf1dd3ee7f9490fa (diff)
downloadtdelibs-229b6440dd12f3fb4595ef043557015c893f4f19.tar.gz
tdelibs-229b6440dd12f3fb4595ef043557015c893f4f19.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
-rw-r--r--tdeui/tdetoolbar.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 2eb90a813..7c6902fed 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -859,9 +859,8 @@ void TDEToolBar::setIconText(IconText icontext, bool update)
TQMainWindow *mw = mainWindow();
if ( mw ) {
mw->setUpdatesEnabled( false );
-// mw->setToolBarsMovable( !mw->toolBarsMovable() ); // Old way
-// mw->setToolBarsMovable( !mw->toolBarsMovable() );
- mw->setCentralWidget(mw->centralWidget()); // This is a faster hack
+ mw->setToolBarsMovable( !mw->toolBarsMovable() );
+ mw->setToolBarsMovable( !mw->toolBarsMovable() );
mw->setUpdatesEnabled( true );
}
}
@@ -897,9 +896,8 @@ void TDEToolBar::setIconSize(int size, bool update)
if ( mainWindow() ) {
TQMainWindow *mw = mainWindow();
mw->setUpdatesEnabled( false );
-// mw->setToolBarsMovable( !mw->toolBarsMovable() ); // Old way
-// mw->setToolBarsMovable( !mw->toolBarsMovable() );
- mw->setCentralWidget(mw->centralWidget()); // This is a faster hack
+ mw->setToolBarsMovable( !mw->toolBarsMovable() );
+ mw->setToolBarsMovable( !mw->toolBarsMovable() );
mw->setUpdatesEnabled( true );
}
}