Skip to content

Commit 3d856d5

Browse files
muyrloonghao
authored andcommitted
fix: phenom-films#67 fix MToolButon set_dayu_size use a custom value, not work
1 parent 383874e commit 3d856d5

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

dayu_widgets/tool_button.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,22 @@ def leaveEvent(self, event):
5959

6060
def get_dayu_size(self):
6161
"""
62-
Get the push button height
62+
Get the tool button height
6363
:return: integer
6464
"""
6565
return self._dayu_size
6666

6767
def set_dayu_size(self, value):
6868
"""
69-
Set the avatar size.
69+
Set the tool button size.
7070
:param value: integer
7171
:return: None
7272
"""
7373
self._dayu_size = value
7474
self.style().polish(self)
7575
if self.toolButtonStyle() == QtCore.Qt.ToolButtonIconOnly:
7676
self.setFixedSize(QtCore.QSize(self._dayu_size, self._dayu_size))
77+
self.setIconSize(QtCore.QSize(self._dayu_size, self._dayu_size))
7778

7879
def get_dayu_svg(self):
7980
"""Get current svg path"""
@@ -87,27 +88,27 @@ def set_dayu_svg(self, path):
8788
dayu_size = QtCore.Property(int, get_dayu_size, set_dayu_size)
8889

8990
def huge(self):
90-
"""Set MPushButton to PrimaryType"""
91+
"""Set MToolButton to huge size"""
9192
self.set_dayu_size(dayu_theme.huge)
9293
return self
9394

9495
def large(self):
95-
"""Set MPushButton to SuccessType"""
96+
"""Set MToolButton to large size"""
9697
self.set_dayu_size(dayu_theme.large)
9798
return self
9899

99100
def medium(self):
100-
"""Set MPushButton to WarningType"""
101+
"""Set MToolButton to medium size"""
101102
self.set_dayu_size(dayu_theme.medium)
102103
return self
103104

104105
def small(self):
105-
"""Set MPushButton to DangerType"""
106+
"""Set MToolButton to small size"""
106107
self.set_dayu_size(dayu_theme.small)
107108
return self
108109

109110
def tiny(self):
110-
"""Set MPushButton to DangerType"""
111+
"""Set MToolButton to tiny size"""
111112
self.set_dayu_size(dayu_theme.tiny)
112113
return self
113114

examples/tool_button_example.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,17 @@ def _init_ui(self):
3434
sub_lay1.addWidget(MToolButton().svg("up_line.svg").icon_only())
3535
sub_lay1.addWidget(MToolButton().svg("up_line.svg").icon_only().small())
3636
sub_lay1.addWidget(MToolButton().svg("down_line.svg").icon_only().tiny())
37+
custom_size = MToolButton().svg("left_line.svg").icon_only()
38+
custom_size.set_dayu_size(200)
39+
custom_size.setToolTip("Custom Size 200")
40+
3741
sub_lay1.addStretch()
3842
size_lay.addLayout(sub_lay1)
43+
size_lay.addWidget(custom_size)
3944

4045
button2 = MToolButton().svg("detail_line.svg").icon_only()
4146
button2.setEnabled(False)
42-
button7 = MToolButton().svg("trash_line.svg").icon_only()
47+
button7 = MToolButton().svg("bold.svg").icon_only()
4348
button7.setCheckable(True)
4449
state_lay = QtWidgets.QHBoxLayout()
4550
state_lay.addWidget(button2)
@@ -55,10 +60,6 @@ def _init_ui(self):
5560
button_lay.addWidget(button_trash)
5661
button_lay.addWidget(button_login)
5762

58-
sub_lay2 = QtWidgets.QHBoxLayout()
59-
sub_lay2.addWidget(button2)
60-
sub_lay2.addWidget(button7)
61-
6263
main_lay = QtWidgets.QVBoxLayout()
6364
main_lay.addWidget(MDivider("different button_size"))
6465
main_lay.addLayout(size_lay)

0 commit comments

Comments
 (0)