fix issue #1892 (window geometry)
This commit is contained in:
@@ -271,12 +271,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
|||||||
self.clear_receive_tab()
|
self.clear_receive_tab()
|
||||||
self.request_list.update()
|
self.request_list.update()
|
||||||
self.tabs.show()
|
self.tabs.show()
|
||||||
|
self.init_geometry()
|
||||||
try:
|
|
||||||
self.setGeometry(*self.wallet.storage.get("winpos-qt"))
|
|
||||||
except:
|
|
||||||
self.setGeometry(100, 100, 840, 400)
|
|
||||||
|
|
||||||
if self.config.get('hide_gui') and self.gui_object.tray.isVisible():
|
if self.config.get('hide_gui') and self.gui_object.tray.isVisible():
|
||||||
self.hide()
|
self.hide()
|
||||||
else:
|
else:
|
||||||
@@ -284,6 +279,16 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
|||||||
self.watching_only_changed()
|
self.watching_only_changed()
|
||||||
run_hook('load_wallet', wallet, self)
|
run_hook('load_wallet', wallet, self)
|
||||||
|
|
||||||
|
def init_geometry(self):
|
||||||
|
winpos = self.wallet.storage.get("winpos-qt")
|
||||||
|
try:
|
||||||
|
screen = self.app.desktop().screenGeometry()
|
||||||
|
assert screen.contains(QRect(*winpos))
|
||||||
|
self.setGeometry(*winpos)
|
||||||
|
except:
|
||||||
|
self.print_error("using default geometry")
|
||||||
|
self.setGeometry(100, 100, 840, 400)
|
||||||
|
|
||||||
def watching_only_changed(self):
|
def watching_only_changed(self):
|
||||||
title = 'Electrum %s - %s' % (self.wallet.electrum_version,
|
title = 'Electrum %s - %s' % (self.wallet.electrum_version,
|
||||||
self.wallet.basename())
|
self.wallet.basename())
|
||||||
|
|||||||
Reference in New Issue
Block a user