snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-19 13:29:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Niko walking out of the screen on X11

Browse source
This commit is contained in:
KockaAdmiralac 2018-03-11 23:57:30 +01:00
parent 3f4f14e719
commit e195d8d1ce
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
journal/unix/journal.py
View file

@ -57,7 +57,6 @@ class Journal(QWidget):
self.label = QLabel(self) self.label = QLabel(self)
self.change_image('default_en') self.change_image('default_en')
self.setWindowFlags(self.windowFlags() | Qt.FramelessWindowHint)
self.setAttribute(Qt.WA_TranslucentBackground) self.setAttribute(Qt.WA_TranslucentBackground)
self.setMouseTracking(True) self.setMouseTracking(True)
self.setWindowTitle(' ') self.setWindowTitle(' ')
@ -94,16 +93,14 @@ class Niko(QWidget):
self.x, self.y, self.start_y, self.app, self.thread = kwargs['x'], kwargs['y'], kwargs['y'], kwargs['app'], kwargs['thread'] self.x, self.y, self.start_y, self.app, self.thread = kwargs['x'], kwargs['y'], kwargs['y'], kwargs['app'], kwargs['thread']
self.screen_width, self.screen_height = kwargs['screen_width'], kwargs['screen_height'] self.screen_width, self.screen_height = kwargs['screen_width'], kwargs['screen_height']
del kwargs['x'], kwargs['y'], kwargs['screen_width'], kwargs['screen_height'], kwargs['app'], kwargs['thread'] del kwargs['x'], kwargs['y'], kwargs['screen_width'], kwargs['screen_height'], kwargs['app'], kwargs['thread']
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.setWindowFlags(self.windowFlags() | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint) self.setWindowFlags(Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint)
self.setAttribute(Qt.WA_TranslucentBackground) self.setAttribute(Qt.WA_TranslucentBackground)
self.setWindowTitle('') self.setMinimumSize(48, 64)
self.setMinimumSize(self.screen_width, self.screen_height) self.setMaximumSize(48, 64)
self.setMaximumSize(self.screen_width, self.screen_height)
self.setGeometry(self.x, self.y, self.x+48, self.y+64)
self.label = QLabel(self) self.label = QLabel(self)
self.frames = [QPixmap(os.path.join(base_path, 'images', 'niko{}.png'.format(n))) for n in range(1,4)] self.frames = [QPixmap(os.path.join(base_path, 'images', 'niko{}.png'.format(n))) for n in range(1,4)]
self.label.setPixmap(self.frames[1]) self.label.setPixmap(self.frames[1])
@ -120,8 +117,13 @@ class Niko(QWidget):
def update(self): def update(self):
self.label.setPixmap(self.frames[self.getFrame()]) self.label.setPixmap(self.frames[self.getFrame()])
self.y += 2 self.y += 2
self.setGeometry(self.x, self.y, self.x+48, self.y+64) if self.y > self.screen_height:
if self.y > self.screen_height: self.app.quit() self.app.quit()
return
elif self.y > self.screen_height - 64:
self.setMinimumSize(48, self.screen_height - self.y)
self.resize(48, self.screen_height - self.y)
self.move(self.x, self.y)
if __name__ == '__main__': if __name__ == '__main__':
app = QApplication(sys.argv) app = QApplication(sys.argv)
@ -153,5 +155,5 @@ if __name__ == '__main__':
thread = WatchPipe() thread = WatchPipe()
thread.change_image.connect(journal.change_image) thread.change_image.connect(journal.change_image)
thread.start() thread.start()
app.exec_() app.exec_()