Skip to content

Commit 6028d5f

Browse files
committed
gtk3: Focus ring radius fixes
Set -gtk-outline-radius focus rings correctly for %linked_* placeholders and .dialog-action-area buttons. Based on upstream commits: https://gitlab.gnome.org/GNOME/gtk/-/commit/cfd530db0de4f988b31d90487895cd96bd800108 https://gitlab.gnome.org/GNOME/gtk/-/commit/34d85329a92d066bc39a2411548c347b3d24367c
1 parent 2c726e4 commit 6028d5f

File tree

1 file changed

+29
-1
lines changed

1 file changed

+29
-1
lines changed

common/gtk-3.0/3.24/sass/_common.scss

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@ toolbar.inline-toolbar toolbutton {
707707
%linked_middle {
708708
border-radius: 0;
709709
border-right-style: none;
710+
-gtk-outline-radius: 0;
710711
}
711712

712713
%linked_left {
@@ -715,6 +716,10 @@ toolbar.inline-toolbar toolbutton {
715716
border-top-right-radius: 0;
716717
border-bottom-right-radius: 0;
717718
border-right-style: none;
719+
-gtk-outline-top-left-radius: 2px;
720+
-gtk-outline-bottom-left-radius: 2px;
721+
-gtk-outline-top-right-radius: 0;
722+
-gtk-outline-bottom-right-radius: 0;
718723
}
719724

720725
%linked_right {
@@ -723,11 +728,16 @@ toolbar.inline-toolbar toolbutton {
723728
border-top-right-radius: 3px;
724729
border-bottom-right-radius: 3px;
725730
border-right-style: solid;
731+
-gtk-outline-top-left-radius: 0;
732+
-gtk-outline-bottom-left-radius: 0;
733+
-gtk-outline-top-right-radius: 2px;
734+
-gtk-outline-bottom-right-radius: 2px;
726735
}
727736

728737
%linked_only_child {
729738
border-radius: 3px;
730739
border-style: solid;
740+
-gtk-outline-radius: 2px;
731741
}
732742

733743
%linked {
@@ -758,22 +768,28 @@ toolbar.inline-toolbar toolbutton {
758768
%linked_vertical_middle {
759769
border-radius: 0;
760770
border-bottom-style: none;
771+
-gtk-outline-radius: 0;
761772
}
762773

763774
%linked_vertical_top {
764775
border-top-left-radius: 3px;
765776
border-top-right-radius: 3px;
777+
-gtk-outline-top-left-radius: 2px;
778+
-gtk-outline-top-right-radius: 2px;
766779
}
767780

768781
%linked_vertical_bottom {
782+
border-bottom-style: solid;
769783
border-bottom-left-radius: 3px;
770784
border-bottom-right-radius: 3px;
771-
border-style: solid;
785+
-gtk-outline-bottom-left-radius: 2px;
786+
-gtk-outline-bottom-right-radius: 2px;
772787
}
773788

774789
%linked_vertical_only_child {
775790
border-radius: 3px;
776791
border-style: solid;
792+
-gtk-outline-radius: 2px;
777793
}
778794

779795
%linked_vertical{
@@ -2702,15 +2718,27 @@ messagedialog { // Message Dialog styling
27022718
%last_button {
27032719
border-radius: 0 0 3px 0;
27042720
border-right-style: none;
2721+
-gtk-outline-bottom-right-radius: 2px;
2722+
-gtk-outline-top-right-radius: 0px;
2723+
-gtk-outline-bottom-left-radius: 0px;
2724+
-gtk-outline-top-left-radius: 0px;
27052725
}
27062726
%first_button {
27072727
border-radius: 0 0 0 3px;
27082728
border-left-style: none;
2729+
-gtk-outline-bottom-left-radius: 2px;
2730+
-gtk-outline-top-left-radius: 0px;
2731+
-gtk-outline-top-right-radius: 0px;
2732+
-gtk-outline-bottom-right-radius: 0px;
27092733
}
27102734
%single_button {
27112735
border-radius: 0 0 3px 3px;
27122736
border-left-style: none;
27132737
border-right-style: none;
2738+
-gtk-outline-top-right-radius: 0px;
2739+
-gtk-outline-top-left-radius: 0px;
2740+
-gtk-outline-bottom-left-radius: 2px;
2741+
-gtk-outline-bottom-right-radius: 2px;
27142742
}
27152743
}
27162744
}

0 commit comments

Comments
 (0)