Skip to content

Commit 4bc8325

Browse files
committedMay 9, 2019
[ui] Fix missing disabled state for {check/radio/group}box
1 parent 69c8915 commit 4bc8325

10 files changed

+93
-21
lines changed
 
Lines changed: 1 addition & 0 deletions

Error rendering embedded code

Invalid image source.

Lines changed: 1 addition & 0 deletions

Error rendering embedded code

Invalid image source.

Lines changed: 1 addition & 0 deletions

Error rendering embedded code

Invalid image source.

Lines changed: 1 addition & 0 deletions

Error rendering embedded code

Invalid image source.

‎resources/themes/Blend of Gray/style.qss

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,11 @@ QGroupBox {
521521
}
522522

523523
QGroupBox::title {
524-
color: @text;
524+
color: @textlight;
525+
}
526+
527+
QGroupBox::title:disabled {
528+
color: @itemalternativebackground;
525529
}
526530

527531
QGroupBox::indicator {
@@ -534,45 +538,73 @@ QGroupBox::indicator:unchecked {
534538
image: url(@theme_path/icons/qcheckbox-unchecked.svg);
535539
}
536540

541+
QGroupBox::indicator:unchecked:disabled {
542+
image: url(@theme_path/icons/qcheckbox-unchecked-disabled.svg);
543+
}
544+
537545
QGroupBox::indicator:checked {
538546
border: 1px solid @background;
539547
image: url(@theme_path/icons/qcheckbox-checked.svg);
540548
}
541549

550+
QGroupBox::indicator:checked:disabled {
551+
image: url(@theme_path/icons/qcheckbox-checked-disabled.svg);
552+
}
553+
542554
/* ==================================================================================== */
543555
/* RADIO BUTTON */
544556
/* ==================================================================================== */
545557

546-
QRadioButton::indicator:unchecked {
558+
QRadioButton::indicator
559+
{
547560
border: 1px solid @background;
548-
image: url(@theme_path/icons/qradiobox-unchecked.svg);
549561
width:0.8em;
550562
height:0.8em;
551563
}
552564

565+
QRadioButton::indicator:unchecked
566+
{
567+
image: url(@theme_path/icons/qradiobox-unchecked.svg);
568+
}
569+
570+
QRadioButton::indicator:unchecked:disabled
571+
{
572+
image: url(@theme_path/icons/qradiobox-unchecked-disabled.svg);
573+
}
574+
553575
QRadioButton::indicator:checked {
554-
border: 1px solid @background;
555576
image: url(@theme_path/icons/qradiobox-checked.svg);
556-
width:0.8em;
557-
height:0.8em;
577+
}
578+
579+
QRadioButton::indicator:checked:disabled {
580+
image: url(@theme_path/icons/qradiobox-checked-disabled.svg);
558581
}
559582

560583
/* ==================================================================================== */
561584
/* CHECKBOX */
562585
/* ==================================================================================== */
563586

564-
QCheckBox::indicator:unchecked {
587+
QCheckBox::indicator
588+
{
565589
border: 1px solid @background;
566-
image: url(@theme_path/icons/qcheckbox-unchecked.svg);
567590
width:0.8em;
568591
height:0.8em;
569592
}
570593

594+
QCheckBox::indicator:unchecked {
595+
image: url(@theme_path/icons/qcheckbox-unchecked.svg);
596+
}
597+
598+
QCheckBox::indicator:unchecked:disabled {
599+
image: url(@theme_path/icons/qcheckbox-unchecked-disabled.svg);
600+
}
601+
571602
QCheckBox::indicator:checked {
572-
border: 1px solid @background;
573603
image: url(@theme_path/icons/qcheckbox-checked.svg);
574-
width:0.8em;
575-
height:0.8em;
604+
}
605+
606+
QCheckBox::indicator:checked:disabled {
607+
image: url(@theme_path/icons/qcheckbox-checked-disabled.svg);
576608
}
577609

578610
/* ==================================================================================== */
Lines changed: 1 addition & 0 deletions

Error rendering embedded code

Invalid image source.

Lines changed: 1 addition & 0 deletions

Error rendering embedded code

Invalid image source.

Lines changed: 1 addition & 0 deletions

Error rendering embedded code

Invalid image source.

Lines changed: 1 addition & 0 deletions

Error rendering embedded code

Invalid image source.

‎resources/themes/Night Mapping/style.qss

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,10 @@ QGroupBox::title {
534534
color: @textlight;
535535
}
536536

537+
QGroupBox::title:disabled {
538+
color: @itemdarkbackground;
539+
}
540+
537541
QGroupBox::indicator {
538542
width: 0.9em;
539543
height: 0.9em;
@@ -544,45 +548,73 @@ QGroupBox::indicator:unchecked {
544548
image: url(@theme_path/icons/qcheckbox-unchecked.svg);
545549
}
546550

551+
QGroupBox::indicator:unchecked:disabled {
552+
image: url(@theme_path/icons/qcheckbox-unchecked-disabled.svg);
553+
}
554+
547555
QGroupBox::indicator:checked {
548556
border: 1px solid @background;
549557
image: url(@theme_path/icons/qcheckbox-checked.svg);
550558
}
551559

560+
QGroupBox::indicator:checked:disabled {
561+
image: url(@theme_path/icons/qcheckbox-checked-disabled.svg);
562+
}
563+
552564
/* ==================================================================================== */
553565
/* RADIO BUTTON */
554566
/* ==================================================================================== */
555567

556-
QRadioButton::indicator:unchecked {
568+
QRadioButton::indicator
569+
{
557570
border: 1px solid @background;
558-
image: url(@theme_path/icons/qradiobox-unchecked.svg);
559571
width:0.8em;
560572
height:0.8em;
561573
}
562574

575+
QRadioButton::indicator:unchecked
576+
{
577+
image: url(@theme_path/icons/qradiobox-unchecked.svg);
578+
}
579+
580+
QRadioButton::indicator:unchecked:disabled
581+
{
582+
image: url(@theme_path/icons/qradiobox-unchecked-disabled.svg);
583+
}
584+
563585
QRadioButton::indicator:checked {
564-
border: 1px solid @background;
565586
image: url(@theme_path/icons/qradiobox-checked.svg);
566-
width:0.8em;
567-
height:0.8em;
587+
}
588+
589+
QRadioButton::indicator:checked:disabled {
590+
image: url(@theme_path/icons/qradiobox-checked-disabled.svg);
568591
}
569592

570593
/* ==================================================================================== */
571594
/* CHECKBOX */
572595
/* ==================================================================================== */
573596

574-
QCheckBox::indicator:unchecked {
597+
QCheckBox::indicator
598+
{
575599
border: 1px solid @background;
576-
image: url(@theme_path/icons/qcheckbox-unchecked.svg);
577600
width:0.8em;
578601
height:0.8em;
579602
}
580603

604+
QCheckBox::indicator:unchecked {
605+
image: url(@theme_path/icons/qcheckbox-unchecked.svg);
606+
}
607+
608+
QCheckBox::indicator:unchecked:disabled {
609+
image: url(@theme_path/icons/qcheckbox-unchecked-disabled.svg);
610+
}
611+
581612
QCheckBox::indicator:checked {
582-
border: 1px solid @background;
583613
image: url(@theme_path/icons/qcheckbox-checked.svg);
584-
width:0.8em;
585-
height:0.8em;
614+
}
615+
616+
QCheckBox::indicator:checked:disabled {
617+
image: url(@theme_path/icons/qcheckbox-checked-disabled.svg);
586618
}
587619

588620
/* ==================================================================================== */

0 commit comments

Comments
 (0)
Please sign in to comment.