← Back to branch summary

~openshift/picard/nx_plugins

« back to all changes in this revision

Viewing changes to picard/ui/mainwindow.py

  • Committer: Philipp Wolfer
  • Author(s): Carlin Mangar
  • Date: 2009-10-25 18:33:55 UTC
  • Revision ID: ph.wolfer@googlemail.com-20091025183355-07xujqkubb0j3n9m
http://bugs.musicbrainz.org/ticket/3627
http://bugs.musicbrainz.org/ticket/2429
Screen geometry obtained in restoreWindowState which prevents windows from disappearing from screen, especially in multiscreen configurations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
picard/ui/mainwindow.py
47
47
               QtCore.QVariant.toByteArray),
48
48
        Option("persist", "window_position", QtCore.QPoint(),
49
49
               QtCore.QVariant.toPoint),
50
 
        Option("persist", "window_size", QtCore.QSize(780, 580),
 
50
        Option("persist", "window_size", QtCore.QSize(780, 560),
51
51
               QtCore.QVariant.toSize),
52
52
        BoolOption("persist", "window_maximized", False),
53
53
        BoolOption("persist", "view_cover_art", False),
137
137
    def restoreWindowState(self):
138
138
        self.restoreState(self.config.persist["window_state"])
139
139
        pos = self.config.persist["window_position"]
140
 
        if pos.x() > 0 and pos.y() > 0:
141
 
            self.move(pos)
142
140
        size = self.config.persist["window_size"]
 
141
        self._desktopgeo = self.tagger.desktop().screenGeometry()
 
142
        if pos.x() > 0 and pos.y() > 0 and pos.x()+size.width() < self._desktopgeo.width() and pos.y()+size.height() < self._desktopgeo.height():
 
143
            self.move(pos)        
143
144
        if size.width() <= 0 or size.height() <= 0:
144
 
            size = QtCore.QSize(780, 580)
 
145
            size = QtCore.QSize(780, 560)
145
146
        self.resize(size)
146
147
        if self.config.persist["window_maximized"]:
147
148
            self.setWindowState(QtCore.Qt.WindowMaximized)