Skip to content

Commit 3ae5038

Browse files
committed
[themes] Properly style widget focus
1 parent bf5b3f0 commit 3ae5038

File tree

4 files changed

+69
-24
lines changed

4 files changed

+69
-24
lines changed

resources/themes/Blend of Gray/style.qss

+33-12
Original file line numberDiff line numberDiff line change
@@ -290,17 +290,6 @@ QComboBox::indicator {
290290
selection-color:transparent;
291291
}
292292

293-
QLineEdit:focus
294-
{
295-
border: 1px solid @selection;
296-
}
297-
298-
299-
QTextEdit:focus
300-
{
301-
border: 1px solid @selection;
302-
}
303-
304293
/* ==================================================================================== */
305294
/* SCROLL BAR */
306295
/* ==================================================================================== */
@@ -719,6 +708,27 @@ QHeaderView::section {
719708
padding: 0 0 0.1em 0.2em;
720709
}
721710

711+
/* ==================================================================================== */
712+
/* FOCUS */
713+
/* ==================================================================================== */
714+
715+
QToolButton:focus, QPushButton:focus, QCheckBox:focus, QRadioButton:focus, QGroupBox:focus {
716+
outline:1px solid @focusdark;
717+
outline-radius: 0.2em;
718+
}
719+
720+
QComboBox:focus, QAbstractSpinBox:focus, QLineEdit:focus, QPlainTextEdit:focus, QTextEdit:focus {
721+
border:1px solid @focus;
722+
}
723+
724+
QToolButton[autoRaise=true]:focus:!pressed {
725+
border:1px solid @focusdark;
726+
}
727+
728+
QToolButton[autoRaise=false]:focus:!pressed {
729+
border:1px solid @focus;
730+
}
731+
722732
/* ==================================================================================== */
723733
/* QGIS-SPECIFIC TWEAKS */
724734
/* ==================================================================================== */
@@ -733,6 +743,10 @@ QgsColorButton:hover, QgsColorRampButton:hover, QgsSymbolButton:hover, QgsFontBu
733743
color:@itembackground;
734744
}
735745

746+
QgsColorButton:focus, QgsColorRampButton:focus, QgsSymbolButton:focus, QgsFontButton:focus {
747+
border:1px solid @focus;
748+
}
749+
736750
QgsMessageBar QLabel, QgsMessageBar QTextEdit, QMessageBar QToolButton {
737751
background: transparent;
738752
border: none;
@@ -775,10 +789,17 @@ QgsMessageBar QScrollBar::down-arrow:vertical {
775789
image: url(@theme_path/icons/arrow-down.svg);
776790
}
777791

778-
QgsPropertyOverrideButton {
792+
QgsPropertyOverrideButton, QgsPropertyOverrideButton:hover, QgsPropertyOverrideButton:pressed {
793+
background: none;
794+
border: 1px solid rgba(0, 0, 0, 0%);
779795
padding: 0px;
780796
}
781797

798+
QgsPropertyOverrideButton:focus {
799+
border:1px solid @focusdark;
800+
border-radius: 0.2em;
801+
}
802+
782803
QListWidget#mOptionsListWidget {
783804
background-color: @itemdarkbackground;
784805
color: @itembackground;

resources/themes/Blend of Gray/variables.qss

+2
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
@toggleon: #ee7913
1313
@selection: #f0f0f0
1414
@hover: #c7c7c7
15+
@focusdark: rgba(0,0,0,100)
16+
@focus: rgba(199,199,199,255)

resources/themes/Night Mapping/style.qss

+33-12
Original file line numberDiff line numberDiff line change
@@ -303,17 +303,6 @@ QComboBox::indicator {
303303
selection-color:transparent;
304304
}
305305

306-
QLineEdit:focus
307-
{
308-
border: 1px solid @focus;
309-
}
310-
311-
312-
QTextEdit:focus
313-
{
314-
border: 1px solid @focus;
315-
}
316-
317306
/* ==================================================================================== */
318307
/* SCROLL BAR */
319308
/* ==================================================================================== */
@@ -732,6 +721,27 @@ QHeaderView::section {
732721
padding: 0 0 0.1em 0.2em;
733722
}
734723

724+
QToolButton[autoRaise=true]:focus:!pressed {
725+
border:1px solid @focusdark;
726+
}
727+
728+
QToolButton[autoRaise=false]:focus:!pressed {
729+
border:1px solid @focusdark;
730+
}
731+
732+
/* ==================================================================================== */
733+
/* FOCUS */
734+
/* ==================================================================================== */
735+
736+
QToolButton:focus, QPushButton:focus, QCheckBox:focus, QRadioButton:focus, QGroupBox:focus {
737+
outline:1px solid @focusdark;
738+
outline-radius: 0.2em;
739+
}
740+
741+
QComboBox:focus, QAbstractSpinBox:focus, QLineEdit:focus, QPlainTextEdit:focus, QTextEdit:focus {
742+
border:1px solid @focusdark;
743+
}
744+
735745
/* ==================================================================================== */
736746
/* QGIS-SPECIFIC TWEAKS */
737747
/* ==================================================================================== */
@@ -746,6 +756,10 @@ QgsColorButton:hover, QgsColorRampButton:hover, QgsSymbolButton:hover, QgsFontBu
746756
color:@itembackground;
747757
}
748758

759+
QgsColorButton:focus, QgsColorRampButton:focus, QgsSymbolButton:focus, QgsFontButton:focus {
760+
border:1px solid @focusdark;
761+
}
762+
749763
QgsMessageBar QLabel, QgsMessageBar QTextEdit, QMessageBar QToolButton, QMessageBar QToolButton::menu-button {
750764
background: transparent;
751765
border: none;
@@ -788,10 +802,17 @@ QgsMessageBar QScrollBar::down-arrow:vertical {
788802
image: url(@theme_path/icons/arrow-down.svg);
789803
}
790804

791-
QgsPropertyOverrideButton {
805+
QgsPropertyOverrideButton, QgsPropertyOverrideButton:hover, QgsPropertyOverrideButton:pressed {
806+
background: none;
807+
border: 1px solid rgba(0, 0, 0, 0%);
792808
padding: 0px;
793809
}
794810

811+
QgsPropertyOverrideButton:focus {
812+
border:1px solid @focusdark;
813+
border-radius: 0.2em;
814+
}
815+
795816
QListWidget#mOptionsListWidget {
796817
background-color: @itembackground;
797818
color: @text;

resources/themes/Night Mapping/variables.qss

+1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
@toggleoff: #535353
1111
@toggleon: #0f6e00
1212
@selection: #0f6e00
13+
@focusdark: rgba(215,128,26,100)
1314
@focus: #d7801a

0 commit comments

Comments
 (0)