Skip to content

Commit 597e359

Browse files
muyrloonghao
muyr
authored and
loonghao
committed
fix: change size in qss to theme variable
1 parent 08fb749 commit 597e359

File tree

3 files changed

+46
-60
lines changed

3 files changed

+46
-60
lines changed

‎dayu_widgets/item_view.py

+1
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ def __init__(self, size=None, show_row_count=False, parent=None):
217217
size = size or dayu_theme.default_size
218218
ver_header_view = MHeaderView(QtCore.Qt.Vertical, parent=self)
219219
ver_header_view.setDefaultSectionSize(size)
220+
ver_header_view.setSortIndicatorShown(False)
220221
self.setVerticalHeader(ver_header_view)
221222
self.header_list = []
222223
self.header_view = MHeaderView(QtCore.Qt.Horizontal, parent=self)

‎dayu_widgets/static/main.qss

+37-57
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ QToolButton#qt_calendar_yearbutton {
147147
QToolButton#qt_calendar_monthbutton::menu-indicator {
148148
subcontrol-origin: padding;
149149
subcontrol-position: center right;
150-
right: 0;
151-
width: @drop_down_small@unit;
150+
right: @indicator_padding@unit;
152151
}
153152

154153
QCalendarWidget QWidget {
@@ -360,7 +359,7 @@ MTaobaoButton:checked{
360359

361360
MBlockButton{
362361
border-radius: 0;
363-
padding: 2px 10px;
362+
padding: 1% 10%;
364363
border:none;
365364
}
366365
MBlockButton:hover{
@@ -374,7 +373,7 @@ MBlockButton:checked{
374373

375374
MUnderlineButton{
376375
border-radius: 0;
377-
padding: 6px 10px;
376+
padding: 1% 10%;
378377
border-color: transparent;
379378
}
380379
MUnderlineButton:hover{
@@ -418,10 +417,8 @@ MToolButton[dayu_size="@tiny"], MPushButton[dayu_size="@tiny"]{
418417
MToolButton::menu-indicator {
419418
subcontrol-origin: border;
420419
subcontrol-position: bottom right;
421-
right: 5px;
422-
bottom: 5px;
423-
height: 10px;
424-
width: 10px;
420+
right: @indicator_padding@unit;
421+
bottom: @indicator_padding@unit;
425422
image: url(@icon_down);
426423
}
427424

@@ -636,10 +633,8 @@ MPushButton:disabled{
636633
MPushButton::menu-indicator {
637634
subcontrol-origin: border;
638635
subcontrol-position: bottom right;
639-
right: 5px;
640-
bottom: 5px;
641-
height: 10px;
642-
width: 10px;
636+
right: @indicator_padding@unit;
637+
bottom: @indicator_padding@unit;
643638
image: url(@icon_down);
644639
}
645640

@@ -681,9 +676,6 @@ MRadioButton::indicator:checked:disabled{
681676

682677

683678
/*MSwitch*/
684-
MSwitch{
685-
spacing: -20px;
686-
}
687679
MSwitch::indicator{
688680
subcontrol-origin: border;
689681
subcontrol-position: center left;
@@ -867,8 +859,8 @@ MTabWidget::tab-bar {
867859
MTabBar::tab {
868860
border: 1px solid @border_color;
869861
border-bottom: none;
870-
border-top-left-radius: 6px;
871-
border-top-right-radius: 6px;
862+
border-top-left-radius: 5%;
863+
border-top-right-radius: 5%;
872864
background-color: @background_in_color;
873865
}
874866

@@ -888,7 +880,7 @@ MTabBar::tab:hover {
888880
MTabBar::close-button {
889881
subcontrol-origin: content;
890882
subcontrol-position: right center;
891-
margin-right: 5px;
883+
right: @indicator_padding@unit;
892884
image: url(@icon_close);
893885
}
894886
MTabBar::close-button:hover {
@@ -920,7 +912,7 @@ MHeaderView {
920912
MHeaderView::section{
921913
background-color: @background_out_color;
922914
border: 0 solid @border_color;
923-
padding: 1px 6px;
915+
padding: 1px @indicator_padding@unit;
924916
}
925917

926918

@@ -944,20 +936,16 @@ MHeaderView::section:hover {
944936
}
945937

946938
MHeaderView::up-arrow {
947-
width: 8px;
948-
height: 8px;
949-
position: relative;
950-
top: -10px;
951-
right: 50%;
939+
subcontrol-origin: padding;
940+
subcontrol-position: center right;
941+
right: @indicator_padding@unit;
952942
image: url(@icon_up);
953943
}
954944

955945
MHeaderView::down-arrow {
956-
width: 8px;
957-
height: 8px;
958-
position: relative;
959-
top: -10px;
960-
right: 50%;
946+
subcontrol-origin: padding;
947+
subcontrol-position: center right;
948+
right: @indicator_padding@unit;
961949
image: url(@icon_down);
962950
}
963951
MListView[dayu_size="@huge"]::item{
@@ -1012,47 +1000,44 @@ MTableView QTableCornerButton::section {
10121000
border: 0px solid @border_color;
10131001
border-right: 1px solid @border_color;
10141002
border-bottom: 1px solid @border_color;
1015-
padding: 1px 6px;
10161003
}
10171004

10181005
QScrollBar:horizontal {
10191006
border: 0 solid @border_color;
1020-
height: 9px;
1021-
margin: 0 32px 0 0;
1007+
height: @indicator_size@unit;
1008+
margin: 0 @scroll_bar_margin@unit 0 0;
10221009
background-color: @border_color;
10231010
}
10241011

10251012
QScrollBar::handle:horizontal {
10261013
background-color: @background_selected_color;
1027-
min-width: 10px;
1014+
border-radius: @scroll_bar_radius@unit;
10281015
}
10291016

10301017
QScrollBar::add-line:horizontal {
10311018
subcontrol-origin: margin;
10321019
subcontrol-position: right center;
10331020
background: @border_color;
1034-
width: 15px;
1021+
width: @scroll_bar_size@unit;
10351022
}
10361023

10371024
QScrollBar::sub-line:horizontal {
10381025
subcontrol-origin: margin;
10391026
subcontrol-position: right center;
10401027
background: @border_color;
1041-
width: 15px;
1042-
right: 16px;
1028+
width: @scroll_bar_size@unit;
1029+
right: @scroll_bar_size@unit;
10431030
}
10441031

10451032
QScrollBar::left-arrow:horizontal {
1046-
width: 9px;
1047-
height: 9px;
1048-
position: relative;
1033+
subcontrol-origin: margin;
1034+
subcontrol-position: center center;
10491035
image: url(@icon_left);
10501036
}
10511037

10521038
QScrollBar::right-arrow:horizontal {
1053-
width: 9px;
1054-
height: 9px;
1055-
position: relative;
1039+
subcontrol-origin: margin;
1040+
subcontrol-position: center center;
10561041
image: url(@icon_right);
10571042
}
10581043

@@ -1062,41 +1047,36 @@ QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
10621047

10631048
QScrollBar:vertical {
10641049
border: 0 solid @border_color;
1065-
width: 9px;
1066-
margin: 0 0 32px 0 ;
1050+
width: @indicator_size@unit;
1051+
margin: 0 0 @scroll_bar_margin@unit 0 ;
10671052
background-color: @border_color;
10681053
}
10691054

10701055
QScrollBar::handle:vertical {
10711056
background-color: @background_selected_color;
1072-
min-height: 10px;
10731057
}
10741058

10751059
QScrollBar::add-line:vertical {
10761060
subcontrol-origin: margin;
10771061
subcontrol-position: center bottom;
10781062
background: @border_color;
1079-
height: 15px;
1063+
height: @scroll_bar_size@unit;
10801064
}
10811065

10821066
QScrollBar::sub-line:vertical {
10831067
subcontrol-origin: margin;
10841068
subcontrol-position: center bottom;
10851069
background: @border_color;
1086-
height: 15px;
1087-
bottom: 16px;
1070+
height: @scroll_bar_size@unit;
1071+
bottom: @scroll_bar_size@unit;
10881072
}
10891073

10901074
QScrollBar::up-arrow:vertical {
1091-
width: 9px;
1092-
height: 9px;
10931075
position: relative;
10941076
image: url(@icon_up)
10951077
}
10961078

10971079
QScrollBar::down-arrow:vertical {
1098-
width: 9px;
1099-
height: 9px;
11001080
position: relative;
11011081
image: url(@icon_down)
11021082
}
@@ -1184,19 +1164,19 @@ MDockWidget {
11841164
MDockWidget::title {
11851165
background: @background_selected_color;
11861166
text-align: left;
1187-
padding-left: 10px;
1167+
padding-left: @indicator_padding@unit;
11881168
}
11891169

11901170
MDockWidget::close-button {
11911171
subcontrol-origin: margin;
11921172
subcontrol-position: right center;
1193-
right: 8px;
1173+
right: @indicator_padding@unit;
11941174
}
11951175

11961176
MDockWidget::float-button {
11971177
subcontrol-origin: margin;
11981178
subcontrol-position: right center;
1199-
right: 30px;
1179+
right: @scroll_bar_margin@unit;
12001180
}
12011181
MDockWidget::close-button:hover, MDockWidget::float-button:hover {
12021182
border: 1px solid @primary_color;
@@ -1241,7 +1221,7 @@ MMenu::item {
12411221
padding: 2px 2px;
12421222
}
12431223
MMenu::item {
1244-
padding: 8px auto;
1224+
padding: @indicator_padding@unit auto;
12451225
}
12461226
MMenu::item:checked {
12471227
color: @primary_color;
@@ -1252,7 +1232,7 @@ MMenu::item:selected {
12521232
}
12531233

12541234
MMenu::indicator {
1255-
left: 6px;
1235+
left: @indicator_padding@unit;
12561236
}
12571237

12581238
QToolTip {

‎dayu_widgets/theme.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,25 @@ def get_theme_size():
7878
"check_box_size": int(13 * scale_factor_x),
7979
"check_box_spacing": int(4 * scale_factor_x),
8080
"radio_size": int(14 * scale_factor_x),
81-
"radio_radius": int(14 * scale_factor_x) / 2.0,
81+
"radio_radius": int(14 * scale_factor_x / 2.0),
8282
"radio_spacing": int(4 * scale_factor_x),
8383
"slider_height": int(4 * scale_factor_x),
8484
"slider_radius": int(3 * scale_factor_x),
8585
"slider_handle_size": int(8 * scale_factor_x),
86-
"slider_handle_radius": int(8 * scale_factor_x) / 1.5,
86+
"slider_handle_radius": int(8 * scale_factor_x / 1.5),
8787
"progress_circle_default_radius": int(120 * scale_factor_x),
8888
"progress_bar_size": int(12 * scale_factor_x),
89-
"progress_bar_radius": int(12 * scale_factor_x) / 2.0,
89+
"progress_bar_radius": int(12 * scale_factor_x / 2.0),
9090
"toast_size": int(120 * scale_factor_x),
9191
"toast_icon_size": int(60 * scale_factor_x),
9292
"big_view_default_size": int(120 * scale_factor_x),
9393
"big_view_max_size": int(400 * scale_factor_x),
9494
"big_view_min_size": int(24 * scale_factor_x),
95+
"indicator_padding": int(4 * scale_factor_x),
96+
"indicator_size": int(8 * scale_factor_x),
97+
"scroll_bar_size": int(12 * scale_factor_x),
98+
"scroll_bar_margin": int(12 * scale_factor_x * 2) + 1,
99+
"scroll_bar_radius": int(12 * scale_factor_x / 2.0),
95100
}
96101

97102

0 commit comments

Comments
 (0)