From fbf2228263e7d9e2cf2c7c649f5a54bf924d1007 Mon Sep 17 00:00:00 2001 From: Wiktor Mazur Date: Tue, 24 Sep 2019 18:22:42 +0200 Subject: [PATCH] FIXED: unexpected window movement during mode change --- gui/src/main.py | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/gui/src/main.py b/gui/src/main.py index 4d3b3cb..9f06530 100644 --- a/gui/src/main.py +++ b/gui/src/main.py @@ -15,11 +15,13 @@ import clipboard from table import Table import engine + class Mode: CURRENT_ZONE = 'Damage: Current zone' OVERALL = 'Damage: Overall' LAST_FIGHT = 'Damage: Last fight' + class BottomButtons(QWidget): def __init__(self, table, mode): QWidget.__init__(self) @@ -61,19 +63,28 @@ class BottomButtons(QWidget): reset[self.mode()]() - def close(self): sys.exit(0) + +class ModeWidget(QComboBox): + def __init__(self): + QComboBox.__init__(self) + + self.addItem(Mode.CURRENT_ZONE) + self.addItem(Mode.OVERALL) + self.addItem(Mode.LAST_FIGHT) + + class MainWidget(QWidget): def __init__(self): QWidget.__init__(self) self.mouse_pos = None - self.mode = QComboBox() - self.mode.minimumContentsLength() + self.mode = ModeWidget() self.table = Table() - self.bottom_buttons = BottomButtons(self.table, lambda : self.mode.currentText()) + self.bottom_buttons = BottomButtons( + self.table, lambda: self.mode.currentText()) self.layout = QVBoxLayout() self.layout.addWidget(self.mode) @@ -81,10 +92,6 @@ class MainWidget(QWidget): self.layout.addWidget(self.bottom_buttons) self.setLayout(self.layout) - self.mode.addItem(Mode.CURRENT_ZONE) - self.mode.addItem(Mode.OVERALL) - self.mode.addItem(Mode.LAST_FIGHT) - self.table.fill(self.session()) timer = QTimer(self) @@ -95,12 +102,17 @@ class MainWidget(QWidget): self.mouse_pos = event.pos() def mouseMoveEvent(self, event): + if self.mode.geometry().contains(event.pos()): + return + if not self.mouse_pos: + return + if event.buttons() & Qt.LeftButton: diff = event.pos() - self.mouse_pos newpos = self.pos() + diff self.move(newpos) - + def session(self): sessions = { Mode.CURRENT_ZONE: engine.get_zone_session, @@ -109,4 +121,3 @@ class MainWidget(QWidget): } return sessions[self.mode.currentText()]() -