Public-Mirror/LunaTranslator
1
0
Fork 0
mirror of https://github.com/HIllya51/LunaTranslator.git synced 2025-01-15 08:53:53 +08:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
恍兮惚兮 2024-11-13 22:26:02 +08:00
parent 772b39e944
commit 313cb514c4
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/version.cmake
View File

@ -1,7 +1,7 @@
set(VERSION_MAJOR 5) set(VERSION_MAJOR 5)
set(VERSION_MINOR 58) set(VERSION_MINOR 58)
set(VERSION_PATCH 6) set(VERSION_PATCH 7)
set(VERSION_REVISION 0) set(VERSION_REVISION 0)
add_definitions(-DVERSION_MAJOR=${VERSION_MAJOR}) add_definitions(-DVERSION_MAJOR=${VERSION_MAJOR})
add_definitions(-DVERSION_MINOR=${VERSION_MINOR}) add_definitions(-DVERSION_MINOR=${VERSION_MINOR})

19
py/LunaTranslator/gui/usefulwidget.py
View File

@ -806,7 +806,7 @@ class resizableframeless(saveposwindow):
self.starth - (gpos.y() - self.starty), self.starth - (gpos.y() - self.starty),
) )
elif self._corner_drag_zuoshang: elif self._corner_drag_zuoshang:
self.setGeometry( self.setgeokeepminsize(
(gpos - self.startxp).x(), (gpos - self.startxp).x(),
(gpos - self.startxp).y(), (gpos - self.startxp).y(),
self.startw - (gpos.x() - self.startx), self.startw - (gpos.x() - self.startx),
@ -814,7 +814,7 @@ class resizableframeless(saveposwindow):
) )
elif self._left_drag: elif self._left_drag:
self.setGeometry( self.setgeokeepminsize(
(gpos - self.startxp).x(), (gpos - self.startxp).x(),
self.y(), self.y(),
self.startw - (gpos.x() - self.startx), self.startw - (gpos.x() - self.startx),
@ -823,14 +823,14 @@ class resizableframeless(saveposwindow):
elif self._bottom_drag: elif self._bottom_drag:
self.resize(self.width(), pos.y()) self.resize(self.width(), pos.y())
elif self._top_drag: elif self._top_drag:
self.setGeometry( self.setgeokeepminsize(
self.x(), self.x(),
(gpos - self.startxp).y(), (gpos - self.startxp).y(),
self.width(), self.width(),
self.starth - (gpos.y() - self.starty), self.starth - (gpos.y() - self.starty),
) )
elif self._corner_drag_zuoxia: elif self._corner_drag_zuoxia:
self.setGeometry( self.setgeokeepminsize(
(gpos - self.startxp).x(), (gpos - self.startxp).x(),
self.y(), self.y(),
self.startw - (gpos.x() - self.startx), self.startw - (gpos.x() - self.startx),
@ -844,6 +844,13 @@ class resizableframeless(saveposwindow):
def mouseReleaseEvent(self, e: QMouseEvent): def mouseReleaseEvent(self, e: QMouseEvent):
self.resetflags() self.resetflags()
def setgeokeepminsize(self, x, y, w, h):
width = max(w, self.minimumWidth())
height = max(h, self.minimumHeight())
x -= width - w
y -= height - h
self.setGeometry(x, y, width, height)
class Prompt_dialog(LDialog): class Prompt_dialog(LDialog):
def __init__(self, parent, title, info, items) -> None: def __init__(self, parent, title, info, items) -> None:
@ -1108,7 +1115,7 @@ def selectcolor(
def getboxlayout( def getboxlayout(
widgets, lc=QHBoxLayout, margin0=False, makewidget=False, delay=False, both=False, space0=False widgets, lc=QHBoxLayout, margin0=False, makewidget=False, delay=False, both=False
): ):
cp_layout = lc() cp_layout = lc()
@ -1126,8 +1133,6 @@ def getboxlayout(
_do = functools.partial(__do, cp_layout, widgets) _do = functools.partial(__do, cp_layout, widgets)
if margin0: if margin0:
cp_layout.setContentsMargins(0, 0, 0, 0) cp_layout.setContentsMargins(0, 0, 0, 0)
if space0:
cp_layout.setSpacing(0)
if not delay: if not delay:
_do() _do()
if makewidget: if makewidget: