BUGfix: GTK3&4 - dialog wid no csd top corners not round

thekomer · Mar 12, 2022 · 1d0771a · 1d0771a
1 parent fa1dbd9
commit 1d0771a
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 128 deletions.
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
@@ -1807,23 +1807,23 @@ combobox:drop(active) {
 /***********
  * Dialogs *
  ***********/
-messagedialog {
+messagedialog, dialog {
   /* Message Dialog styling */ }
-  messagedialog .titlebar:not(headerbar) {
+  messagedialog .titlebar:not(headerbar), dialog .titlebar:not(headerbar) {
     background-color: rgba(14, 17, 29, 0.95); }
-  messagedialog .titlebar {
+  messagedialog .titlebar, dialog .titlebar {
     min-height: 20px;
     background-image: none;
     background-color: rgba(14, 17, 29, 0.95);
     border-style: none;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px; }
-  messagedialog.csd.background {
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px; }
+  messagedialog.csd.background, dialog.csd.background {
     background-color: rgba(14, 17, 29, 0.95);
     color: #BFC3CD;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px; }
-  messagedialog.csd .dialog-action-area button {
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px; }
+  messagedialog.csd .dialog-action-area button, dialog.csd .dialog-action-area button {
     padding: 10px 14px;
     border-radius: 0;
     border-left-style: solid;
@@ -1832,15 +1832,15 @@ messagedialog {
     background-color: transparent;
     color: #BFC3CD;
     box-shadow: none; }
-    messagedialog.csd .dialog-action-area button:hover {
+    messagedialog.csd .dialog-action-area button:hover, dialog.csd .dialog-action-area button:hover {
       background-color: rgba(255, 106, 0, 0.9);
       color: white; }
-    messagedialog.csd .dialog-action-area button:first-child {
+    messagedialog.csd .dialog-action-area button:first-child, dialog.csd .dialog-action-area button:first-child {
       border-left-style: none;
       border-bottom-left-radius: 4px; }
-    messagedialog.csd .dialog-action-area button:last-child {
+    messagedialog.csd .dialog-action-area button:last-child, dialog.csd .dialog-action-area button:last-child {
       border-bottom-right-radius: 4px; }
-    messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.suggested-action {
+    messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.suggested-action, dialog.csd .dialog-action-area button.destructive-action, dialog.csd .dialog-action-area button.suggested-action {
       color: white; }
 
 filechooser .dialog-action-box {
@@ -1895,9 +1895,6 @@ dialog #pathbarbox {
       dialog #pathbarbox .linked.path-bar button:disabled {
         color: #676a75; }
 
-dialog.background {
-  border-radius: 0 0 10px 10px; }
-
 /****************
  * Text Entries *
  ****************/

diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
@@ -1807,23 +1807,23 @@ combobox:drop(active) {
 /***********
  * Dialogs *
  ***********/
-messagedialog {
+messagedialog, dialog {
   /* Message Dialog styling */ }
-  messagedialog .titlebar:not(headerbar) {
+  messagedialog .titlebar:not(headerbar), dialog .titlebar:not(headerbar) {
     background-color: rgba(14, 17, 29, 0.95); }
-  messagedialog .titlebar {
+  messagedialog .titlebar, dialog .titlebar {
     min-height: 20px;
     background-image: none;
     background-color: rgba(14, 17, 29, 0.95);
     border-style: none;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px; }
-  messagedialog.csd.background {
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px; }
+  messagedialog.csd.background, dialog.csd.background {
     background-color: rgba(14, 17, 29, 0.95);
     color: #BFC3CD;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px; }
-  messagedialog.csd .dialog-action-area button {
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px; }
+  messagedialog.csd .dialog-action-area button, dialog.csd .dialog-action-area button {
     padding: 10px 14px;
     border-radius: 0;
     border-left-style: solid;
@@ -1832,15 +1832,15 @@ messagedialog {
     background-color: transparent;
     color: #BFC3CD;
     box-shadow: none; }
-    messagedialog.csd .dialog-action-area button:hover {
+    messagedialog.csd .dialog-action-area button:hover, dialog.csd .dialog-action-area button:hover {
       background-color: rgba(255, 106, 0, 0.9);
       color: white; }
-    messagedialog.csd .dialog-action-area button:first-child {
+    messagedialog.csd .dialog-action-area button:first-child, dialog.csd .dialog-action-area button:first-child {
       border-left-style: none;
       border-bottom-left-radius: 4px; }
-    messagedialog.csd .dialog-action-area button:last-child {
+    messagedialog.csd .dialog-action-area button:last-child, dialog.csd .dialog-action-area button:last-child {
       border-bottom-right-radius: 4px; }
-    messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.suggested-action {
+    messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.suggested-action, dialog.csd .dialog-action-area button.destructive-action, dialog.csd .dialog-action-area button.suggested-action {
       color: white; }
 
 filechooser .dialog-action-box {
@@ -1895,9 +1895,6 @@ dialog #pathbarbox {
       dialog #pathbarbox .linked.path-bar button:disabled {
         color: #676a75; }
 
-dialog.background {
-  border-radius: 0 0 10px 10px; }
-
 /****************
  * Text Entries *
  ****************/

diff --git a/gtk-3.0/widgets/_dialogs.scss b/gtk-3.0/widgets/_dialogs.scss
@@ -1,7 +1,7 @@
 /***********
  * Dialogs *
  ***********/
-messagedialog { /* Message Dialog styling */
+messagedialog, dialog { /* Message Dialog styling */
   .titlebar:not(headerbar) {
     background-color: transparentize(if($variant=='light', $headerbar_color, $bg_color), 0.05);
   }
@@ -10,8 +10,8 @@ messagedialog { /* Message Dialog styling */
     background-image: none;
     background-color: transparentize(if($variant=='light', $headerbar_color, $bg_color), 0.05);
     border-style: none;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
+    border-top-left-radius: 10px; //4px;
+    border-top-right-radius: 10px; //4px;
   }
 
   &.csd { // rounded bottom border styling for csd version
@@ -20,8 +20,8 @@ messagedialog { /* Message Dialog styling */
       color: if($variant=='light', $headerbar_fg_color, $fg_color);
 
       // bigger radius for better antialiasing
-      border-bottom-left-radius: 5px;
-      border-bottom-right-radius: 5px;
+      border-bottom-left-radius: 10px; //5px;
+      border-bottom-right-radius: 10px; //5px;
     }
 
     .dialog-action-area button {
@@ -107,7 +107,3 @@ dialog {
 		}
 	}
 }
-
-dialog.background {
-	border-radius: 0 0 10px 10px;
-}
diff --git a/gtk-4.0/gtk-dark.css b/gtk-4.0/gtk-dark.css
@@ -1786,42 +1786,41 @@ combobox:drop(active) {
 /***********
  * Dialogs *
  ***********/
-messagedialog .titlebar:not(headerbar) {
-  background-color: rgba(14, 17, 29, 0.95); }
-
-messagedialog .titlebar {
-  min-height: 20px;
-  background-image: none;
-  background-color: rgba(14, 17, 29, 0.95);
-  border-style: none;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px; }
-
-messagedialog.csd.background {
-  background-color: rgba(14, 17, 29, 0.95);
-  color: #BFC3CD;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px; }
-
-messagedialog.csd .dialog-action-area button {
-  padding: 10px 14px;
-  border-radius: 0;
-  border-left-style: solid;
-  border-right-style: none;
-  border-bottom-style: none;
-  background-color: transparent;
-  color: #BFC3CD;
-  box-shadow: none; }
-  messagedialog.csd .dialog-action-area button:hover {
-    background-color: rgba(255, 106, 0, 0.9);
-    color: white; }
-  messagedialog.csd .dialog-action-area button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 4px; }
-  messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 4px; }
-  messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.suggested-action {
-    color: white; }
+messagedialog, dialog {
+  /* Message Dialog styling */ }
+  messagedialog .titlebar:not(headerbar), dialog .titlebar:not(headerbar) {
+    background-color: rgba(14, 17, 29, 0.95); }
+  messagedialog .titlebar, dialog .titlebar {
+    min-height: 20px;
+    background-image: none;
+    background-color: rgba(14, 17, 29, 0.95);
+    border-style: none;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px; }
+  messagedialog.csd.background, dialog.csd.background {
+    background-color: rgba(14, 17, 29, 0.95);
+    color: #BFC3CD;
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px; }
+  messagedialog.csd .dialog-action-area button, dialog.csd .dialog-action-area button {
+    padding: 10px 14px;
+    border-radius: 0;
+    border-left-style: solid;
+    border-right-style: none;
+    border-bottom-style: none;
+    background-color: transparent;
+    color: #BFC3CD;
+    box-shadow: none; }
+    messagedialog.csd .dialog-action-area button:hover, dialog.csd .dialog-action-area button:hover {
+      background-color: rgba(255, 106, 0, 0.9);
+      color: white; }
+    messagedialog.csd .dialog-action-area button:first-child, dialog.csd .dialog-action-area button:first-child {
+      border-left-style: none;
+      border-bottom-left-radius: 4px; }
+    messagedialog.csd .dialog-action-area button:last-child, dialog.csd .dialog-action-area button:last-child {
+      border-bottom-right-radius: 4px; }
+    messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.suggested-action, dialog.csd .dialog-action-area button.destructive-action, dialog.csd .dialog-action-area button.suggested-action {
+      color: white; }
 
 filechooser .dialog-action-box {
   border-top: 1px solid rgba(255, 255, 255, 0.05); }
@@ -1875,9 +1874,6 @@ dialog #pathbarbox {
       dialog #pathbarbox .linked.path-bar button:disabled {
         color: #676a75; }
 
-dialog.background {
-  border-radius: 0 0 10px 10px; }
-
 /****************
  * Text Entries *
  ****************/

diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
@@ -1786,42 +1786,41 @@ combobox:drop(active) {
 /***********
  * Dialogs *
  ***********/
-messagedialog .titlebar:not(headerbar) {
-  background-color: rgba(14, 17, 29, 0.95); }
-
-messagedialog .titlebar {
-  min-height: 20px;
-  background-image: none;
-  background-color: rgba(14, 17, 29, 0.95);
-  border-style: none;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px; }
-
-messagedialog.csd.background {
-  background-color: rgba(14, 17, 29, 0.95);
-  color: #BFC3CD;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px; }
-
-messagedialog.csd .dialog-action-area button {
-  padding: 10px 14px;
-  border-radius: 0;
-  border-left-style: solid;
-  border-right-style: none;
-  border-bottom-style: none;
-  background-color: transparent;
-  color: #BFC3CD;
-  box-shadow: none; }
-  messagedialog.csd .dialog-action-area button:hover {
-    background-color: rgba(255, 106, 0, 0.9);
-    color: white; }
-  messagedialog.csd .dialog-action-area button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 4px; }
-  messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 4px; }
-  messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.suggested-action {
-    color: white; }
+messagedialog, dialog {
+  /* Message Dialog styling */ }
+  messagedialog .titlebar:not(headerbar), dialog .titlebar:not(headerbar) {
+    background-color: rgba(14, 17, 29, 0.95); }
+  messagedialog .titlebar, dialog .titlebar {
+    min-height: 20px;
+    background-image: none;
+    background-color: rgba(14, 17, 29, 0.95);
+    border-style: none;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px; }
+  messagedialog.csd.background, dialog.csd.background {
+    background-color: rgba(14, 17, 29, 0.95);
+    color: #BFC3CD;
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px; }
+  messagedialog.csd .dialog-action-area button, dialog.csd .dialog-action-area button {
+    padding: 10px 14px;
+    border-radius: 0;
+    border-left-style: solid;
+    border-right-style: none;
+    border-bottom-style: none;
+    background-color: transparent;
+    color: #BFC3CD;
+    box-shadow: none; }
+    messagedialog.csd .dialog-action-area button:hover, dialog.csd .dialog-action-area button:hover {
+      background-color: rgba(255, 106, 0, 0.9);
+      color: white; }
+    messagedialog.csd .dialog-action-area button:first-child, dialog.csd .dialog-action-area button:first-child {
+      border-left-style: none;
+      border-bottom-left-radius: 4px; }
+    messagedialog.csd .dialog-action-area button:last-child, dialog.csd .dialog-action-area button:last-child {
+      border-bottom-right-radius: 4px; }
+    messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.suggested-action, dialog.csd .dialog-action-area button.destructive-action, dialog.csd .dialog-action-area button.suggested-action {
+      color: white; }
 
 filechooser .dialog-action-box {
   border-top: 1px solid rgba(255, 255, 255, 0.05); }
@@ -1875,9 +1874,6 @@ dialog #pathbarbox {
       dialog #pathbarbox .linked.path-bar button:disabled {
         color: #676a75; }
 
-dialog.background {
-  border-radius: 0 0 10px 10px; }
-
 /****************
  * Text Entries *
  ****************/

diff --git a/gtk-4.0/widgets/_dialogs.scss b/gtk-4.0/widgets/_dialogs.scss
@@ -1,7 +1,7 @@
 /***********
  * Dialogs *
  ***********/
-messagedialog { // Message Dialog styling
+messagedialog, dialog { /* Message Dialog styling */
   .titlebar:not(headerbar) {
     background-color: transparentize(if($variant=='light', $headerbar_color, $bg_color), 0.05);
   }
@@ -10,8 +10,8 @@ messagedialog { // Message Dialog styling
     background-image: none;
     background-color: transparentize(if($variant=='light', $headerbar_color, $bg_color), 0.05);
     border-style: none;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
+    border-top-left-radius: 10px; //4px;
+    border-top-right-radius: 10px; //4px;
   }
 
   &.csd { // rounded bottom border styling for csd version
@@ -20,8 +20,8 @@ messagedialog { // Message Dialog styling
       color: if($variant=='light', $headerbar_fg_color, $fg_color);
 
       // bigger radius for better antialiasing
-      border-bottom-left-radius: 5px;
-      border-bottom-right-radius: 5px;
+      border-bottom-left-radius: 10px; //5px;
+      border-bottom-right-radius: 10px; //5px;
     }
 
     .dialog-action-area button {
@@ -107,7 +107,3 @@ dialog {
 		}
 	}
 }
-
-dialog.background {
-	border-radius: 0 0 10px 10px;
-}