Skip to content

Commit

Permalink
Merge bitcoin#1173: [GUI][Trivial] Remove every pushButton focus deco…
Browse files Browse the repository at this point in the history 
…ration property.

abe7632 [GUI] Remove every pushButton focus property. (furszy)

Pull request description:

  This is because a **linux-only** issue in which the button focus highlight decoration seems to come from the style `QStyle::PE_FrameFocusRect` which is not the one set in the css files.

  <img width="426" alt="Screen Shot 2019-12-05 at 12 16 35 AM" src="https://user-images.githubusercontent.com/5377650/70201174-8d7f8f80-16f4-11ea-9e6b-1a6b4827feb2.png">
  . Screenshot examples:
  <img width="550" alt="Screen Shot 2019-12-05 at 12 16 28 AM" src="https://user-images.githubusercontent.com/5377650/70201180-983a2480-16f4-11ea-8b7f-bc29f3d4d614.png">

ACKs for top commit:
  random-zebra:
    ACK abe7632
  Fuzzbawls:
    utACK abe7632

Tree-SHA512: ef948f896f0d3d4d56845489a981b51e36c925a332be0d745d302824d65921c1bb08803668600128d9fe2107e2306f6a2c3a35de613d7e198a4f8f604b84610e
  • Loading branch information
@furszy
furszy committed Dec 8, 2019
2 parents eb1eb4d + abe7632 commit 8e42e03
Show file tree
Hide file tree
Showing 43 changed files with 529 additions and 42 deletions.
6 changes: 6 additions & 0 deletions src/qt/pivx/forms/addnewaddressdialog.ui
View file
Expand Up @@ -170,6 +170,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>CANCEL</string>
</property>
Expand All @@ -183,6 +186,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>OK</string>
</property>
Expand Down
9 changes: 9 additions & 0 deletions src/qt/pivx/forms/addnewcontactdialog.ui
View file
Expand Up @@ -126,6 +126,9 @@
<height>24</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -240,6 +243,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>CANCEL</string>
</property>
Expand All @@ -253,6 +259,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>OK</string>
</property>
Expand Down
6 changes: 6 additions & 0 deletions src/qt/pivx/forms/addresseswidget.ui
View file
Expand Up @@ -209,6 +209,9 @@
<height>100</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -384,6 +387,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>OK</string>
</property>
Expand Down
6 changes: 6 additions & 0 deletions src/qt/pivx/forms/coincontrolpivwidget.ui
View file
Expand Up @@ -493,6 +493,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>CANCEL</string>
</property>
Expand All @@ -506,6 +509,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>OK</string>
</property>
Expand Down
19 changes: 17 additions & 2 deletions src/qt/pivx/forms/coldstakingwidget.ui
View file
Expand Up @@ -183,8 +183,11 @@
<height>30</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>PushButton</string>
<string/>
</property>
<property name="checkable">
<bool>true</bool>
Expand All @@ -208,8 +211,11 @@
<height>30</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>PushButton</string>
<string/>
</property>
<property name="checkable">
<bool>true</bool>
Expand Down Expand Up @@ -443,6 +449,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -478,6 +487,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -678,6 +690,9 @@
<height>100</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand Down
5 changes: 4 additions & 1 deletion src/qt/pivx/forms/csrow.ui
View file
Expand Up @@ -153,14 +153,17 @@
<height>32</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string notr="true">border:none; background-color:transparent;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="resource.qrc">
<iconset>
<normaloff>://ic-menu-hover</normaloff>://ic-menu-hover</iconset>
</property>
<property name="iconSize">
Expand Down
26 changes: 25 additions & 1 deletion src/qt/pivx/forms/dashboardwidget.ui
View file
Expand Up @@ -399,6 +399,9 @@
<height>100</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -447,8 +450,11 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>PushButton</string>
<string/>
</property>
</widget>
</item>
Expand Down Expand Up @@ -847,6 +853,9 @@
<height>19</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
Expand All @@ -869,6 +878,9 @@
<height>19</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
Expand Down Expand Up @@ -968,6 +980,9 @@ margin:0px;</string>
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Days</string>
</property>
Expand All @@ -993,6 +1008,9 @@ margin:0px;</string>
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Months</string>
</property>
Expand Down Expand Up @@ -1024,6 +1042,9 @@ margin:0px;</string>
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Years</string>
</property>
Expand Down Expand Up @@ -1250,6 +1271,9 @@ margin:0px;</string>
<height>100</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand Down
9 changes: 9 additions & 0 deletions src/qt/pivx/forms/defaultdialog.ui
View file
Expand Up @@ -129,6 +129,9 @@
<height>24</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -210,6 +213,9 @@
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>CANCEL</string>
</property>
Expand All @@ -229,6 +235,9 @@
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>SAVE</string>
</property>
Expand Down
11 changes: 10 additions & 1 deletion src/qt/pivx/forms/denomgenerationdialog.ui
View file
Expand Up @@ -129,8 +129,11 @@
<height>24</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>PushButton</string>
<string/>
</property>
</widget>
</item>
Expand Down Expand Up @@ -311,6 +314,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>CANCEL</string>
</property>
Expand All @@ -324,6 +330,9 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>SAVE</string>
</property>
Expand Down
3 changes: 3 additions & 0 deletions src/qt/pivx/forms/expandablebutton.ui
View file
Expand Up @@ -55,6 +55,9 @@
<height>36</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string notr="true">padding-right:5px;padding-left:5px;</string>
</property>
Expand Down
8 changes: 7 additions & 1 deletion src/qt/pivx/forms/masternodeswidget.ui
View file
Expand Up @@ -206,6 +206,9 @@
<height>100</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -271,8 +274,11 @@
<height>50</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>PushButton</string>
<string/>
</property>
</widget>
</item>
Expand Down

0 comments on commit 8e42e03

Please sign in to comment.