fix regression of #2778 which reappeared with qt 5.10 in combination with up-to-date KDE

this should also avoid an unneccessary KDE maximize animation when exiting fullscreen into maximized
This commit is contained in:
Christian Helbling 2018-01-12 10:54:05 +01:00
parent 1f8d6e2168
commit 699abef159
2 changed files with 2 additions and 2 deletions

View File

@ -2201,6 +2201,6 @@ class CommandDispatcher:
window.state_before_fullscreen & ~Qt.WindowFullScreen) window.state_before_fullscreen & ~Qt.WindowFullScreen)
else: else:
window.state_before_fullscreen = window.windowState() window.state_before_fullscreen = window.windowState()
window.showFullScreen() window.setWindowState(Qt.WindowFullScreen | window.state_before_fullscreen)
log.misc.debug('state before fullscreen: {}'.format( log.misc.debug('state before fullscreen: {}'.format(
debug.qflags_key(Qt, window.state_before_fullscreen))) debug.qflags_key(Qt, window.state_before_fullscreen)))

View File

@ -498,7 +498,7 @@ class MainWindow(QWidget):
if not config.val.content.windowed_fullscreen: if not config.val.content.windowed_fullscreen:
if on: if on:
self.state_before_fullscreen = self.windowState() self.state_before_fullscreen = self.windowState()
self.showFullScreen() self.setWindowState(Qt.WindowFullScreen | self.state_before_fullscreen)
elif self.isFullScreen(): elif self.isFullScreen():
self.setWindowState(self.state_before_fullscreen) self.setWindowState(self.state_before_fullscreen)
log.misc.debug('on: {}, state before fullscreen: {}'.format( log.misc.debug('on: {}, state before fullscreen: {}'.format(