Skip to content

Commit 12e7906

Browse files
Neoperolfurszy
Neoperol
authored and
furszy
committed
Combobox arrow style and
1 parent 014df06 commit 12e7906

File tree

4 files changed

+61
-34
lines changed

4 files changed

+61
-34
lines changed

‎src/qt/pivx/forms/topbar.ui‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -603,19 +603,19 @@ border:none;</string>
603603
</property>
604604
<layout class="QVBoxLayout" name="containerQR">
605605
<property name="spacing">
606-
<number>6</number>
606+
<number>0</number>
607607
</property>
608608
<property name="leftMargin">
609609
<number>5</number>
610610
</property>
611611
<property name="topMargin">
612-
<number>5</number>
612+
<number>10</number>
613613
</property>
614614
<property name="rightMargin">
615615
<number>5</number>
616616
</property>
617617
<property name="bottomMargin">
618-
<number>9</number>
618+
<number>0</number>
619619
</property>
620620
<item>
621621
<widget class="QPushButton" name="btnQr">
@@ -625,6 +625,12 @@ border:none;</string>
625625
<height>70</height>
626626
</size>
627627
</property>
628+
<property name="maximumSize">
629+
<size>
630+
<width>16777215</width>
631+
<height>70</height>
632+
</size>
633+
</property>
628634
<property name="text">
629635
<string/>
630636
</property>
@@ -636,18 +642,34 @@ border:none;</string>
636642
</property>
637643
</widget>
638644
</item>
645+
<item>
646+
<spacer name="verticalSpacer">
647+
<property name="orientation">
648+
<enum>Qt::Vertical</enum>
649+
</property>
650+
<property name="sizeType">
651+
<enum>QSizePolicy::Fixed</enum>
652+
</property>
653+
<property name="sizeHint" stdset="0">
654+
<size>
655+
<width>20</width>
656+
<height>20</height>
657+
</size>
658+
</property>
659+
</spacer>
660+
</item>
639661
<item alignment="Qt::AlignHCenter|Qt::AlignBottom">
640662
<widget class="QPushButton" name="pushButtonQR">
641663
<property name="minimumSize">
642664
<size>
643-
<width>0</width>
644-
<height>24</height>
665+
<width>36</width>
666+
<height>36</height>
645667
</size>
646668
</property>
647669
<property name="maximumSize">
648670
<size>
649-
<width>16777215</width>
650-
<height>24</height>
671+
<width>36</width>
672+
<height>36</height>
651673
</size>
652674
</property>
653675
<property name="text">

‎src/qt/pivx/res/css/style_dark.css‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/
334334
}
335335

336336
QPushButton[cssClass="btn-qr"] {
337-
qproperty-icon: url("://ic-arrow-drop-white-down");
337+
qproperty-icon: url("://ic-arrow-drop-down-white");
338338
qproperty-iconSize: 24px 24px;
339339
background-color:transparent;
340340
}
@@ -1768,9 +1768,6 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/
17681768

17691769

17701770
QComboBox[cssClass="btn-combo"] {
1771-
background-image: url("://ic-arrow-drop-down");
1772-
background-position:right center;
1773-
background-repeat:no-repeat;
17741771
background-color:#0f0b16;
17751772
padding:10px 20px 10px 10px;
17761773
font-size:16px;
@@ -1779,6 +1776,12 @@ QComboBox[cssClass="btn-combo"] {
17791776
text-align: right;
17801777
}
17811778

1779+
QComboBox[cssClass="btn-combo"]::down-arrow {
1780+
image: url("://ic-arrow-drop-down");
1781+
width: 24px;
1782+
height: 24px;
1783+
}
1784+
17821785
QComboBox[cssClass="btn-combo-edit"] {
17831786
background-image: url("://ic-arrow-drop-down-white");
17841787
background-position:right center;
@@ -1806,9 +1809,6 @@ QComboBox[cssClass="btn-combo-options"] {
18061809

18071810

18081811
QComboBox {
1809-
background-image: url("://ic-arrow-drop-down-white");
1810-
background-position:right center;
1811-
background-repeat:no-repeat;
18121812
background-color:transparent;
18131813
padding-right:20px;
18141814
font-size:16px;
@@ -1837,7 +1837,9 @@ QComboBox::drop-down {
18371837
}
18381838

18391839
QComboBox::down-arrow {
1840-
height: 10px;
1840+
image: url("://ic-arrow-drop-down");
1841+
width: 24px;
1842+
height: 24px;
18411843
}
18421844

18431845
QComboBox::down-arrow:on { /* shift the arrow when popup is open */

‎src/qt/pivx/res/css/style_light.css‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/
341341
}
342342

343343
QPushButton[cssClass="btn-qr"] {
344-
qproperty-icon: url("://ic-arrow-drop-white-down");
344+
qproperty-icon: url("://ic-arrow-drop-down-white");
345345
qproperty-iconSize: 24px 24px;
346346
background-color:transparent;
347347
}
@@ -1763,9 +1763,6 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/
17631763

17641764

17651765
QComboBox[cssClass="btn-combo"] {
1766-
background-image: url("://ic-arrow-drop-down");
1767-
background-position:right center;
1768-
background-repeat:no-repeat;
17691766
background-color:#ffffff;
17701767
padding:10px 20px 10px 10px;
17711768
font-size:16px;
@@ -1774,6 +1771,12 @@ QComboBox[cssClass="btn-combo"] {
17741771
text-align: right;
17751772
}
17761773

1774+
QComboBox[cssClass="btn-combo"]::down-arrow {
1775+
image: url("://ic-arrow-drop-down");
1776+
width: 24px;
1777+
height: 24px;
1778+
}
1779+
17771780
QComboBox[cssClass="btn-combo-edit"] {
17781781
background-image: url("://ic-arrow-drop-down");
17791782
background-position:right center;
@@ -1801,9 +1804,6 @@ QComboBox[cssClass="btn-combo-options"] {
18011804

18021805

18031806
QComboBox {
1804-
background-image: url("://ic-arrow-drop-down");
1805-
background-position:right center;
1806-
background-repeat:no-repeat;
18071807
background-color:transparent;
18081808
padding-right:20px;
18091809
font-size:16px;
@@ -1832,7 +1832,9 @@ QComboBox::drop-down {
18321832
}
18331833

18341834
QComboBox::down-arrow {
1835-
height: 10px;
1835+
image: url("://ic-arrow-drop-down");
1836+
width: 24px;
1837+
height: 24px;
18361838
}
18371839

18381840
QComboBox::down-arrow:on { /* shift the arrow when popup is open */

‎src/qt/pivx/res/img/ic-arrow-drop-down-white.svg‎

Lines changed: 12 additions & 11 deletions
Loading

0 commit comments

Comments
 (0)