mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-11 16:44:05 +02:00
* Fixed statusbar shifting to the right when going into fullscreen mode on OSX.
This commit is contained in:
@@ -941,6 +941,12 @@ TomahawkWindow::fullScreenEntered()
|
|||||||
TomahawkSettings::instance()->setFullscreenEnabled( true );
|
TomahawkSettings::instance()->setFullscreenEnabled( true );
|
||||||
statusBar()->setSizeGripEnabled( false );
|
statusBar()->setSizeGripEnabled( false );
|
||||||
|
|
||||||
|
// Since we just disabled the size-grip the entire statusbar will shift a bit to the right
|
||||||
|
// The volume bar would now have no margin to the right screen edge. Prevent that.
|
||||||
|
QMargins margins = statusBar()->contentsMargins();
|
||||||
|
margins.setRight( 24 );
|
||||||
|
statusBar()->setContentsMargins( margins );
|
||||||
|
|
||||||
#if defined( Q_WS_MAC )
|
#if defined( Q_WS_MAC )
|
||||||
ActionCollection::instance()->getAction( "fullscreen" )->setText( tr( "Exit Full Screen" ) );
|
ActionCollection::instance()->getAction( "fullscreen" )->setText( tr( "Exit Full Screen" ) );
|
||||||
#endif
|
#endif
|
||||||
@@ -953,6 +959,12 @@ TomahawkWindow::fullScreenExited()
|
|||||||
TomahawkSettings::instance()->setFullscreenEnabled( false );
|
TomahawkSettings::instance()->setFullscreenEnabled( false );
|
||||||
statusBar()->setSizeGripEnabled( true );
|
statusBar()->setSizeGripEnabled( true );
|
||||||
|
|
||||||
|
// Since we just enabled the size-grip the entire statusbar will shift a bit to the left
|
||||||
|
// The volume bar would now have too big a margin to the right screen edge. Prevent that.
|
||||||
|
QMargins margins = statusBar()->contentsMargins();
|
||||||
|
margins.setRight( 0 );
|
||||||
|
statusBar()->setContentsMargins( margins );
|
||||||
|
|
||||||
#if defined( Q_WS_MAC )
|
#if defined( Q_WS_MAC )
|
||||||
ActionCollection::instance()->getAction( "fullscreen" )->setText( tr( "Enter Full Screen" ) );
|
ActionCollection::instance()->getAction( "fullscreen" )->setText( tr( "Enter Full Screen" ) );
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user