[Mac] Fix button labels

1 files changed, 13 insertions, 20 deletions

diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.mac b/main/src/core/MonoDevelop.Ide/gtkrc.mac
index 204d46b9bd..3f543d6be0 100644
--- a/main/src/core/MonoDevelop.Ide/gtkrc.mac
+++ b/main/src/core/MonoDevelop.Ide/gtkrc.mac
@@ -120,42 +120,35 @@ style "wider" = "default" {
     ythickness = 3
 }
 
-style "button" {
+style "button" = "default" {
     xthickness = 2
     ythickness = 4
 
     font_name = "Helvetica Neue 13"
 
-    bg[NORMAL] = @bg_color
-    bg[PRELIGHT] = shade(1.1, @bg_color)
-    bg[ACTIVE] = @bg_color
-    bg[INSENSITIVE] = @bg_color
+    bg[PRELIGHT] = @bg_color # Mac buttons have no hover state
+    fg[ACTIVE] = @selected_fg_color
 
     GtkWidget::focus-padding = 0
+    GtkWidget::focus-line-width = 1
 
     engine "xamarin" {
         rgba = FALSE
         contrast = 1.0
         gradient_shades = {0.96, 0.918, 0.926, 0.858}
         focus_color = shade(0.6, @bg_color)
-        textstyle = 1
+        textstyle = 0
+        highlight_shade = 1.0
+        lightborder_shade = 1.0
     }
 }
 
-style "dialog-button" = "default" {
-    xthickness = 3
-    ythickness = 2
+style "dialog-button" = "button" {
 
-    fg[ACTIVE] = @selected_fg_color
-
-    font_name = "Helvetica Neue 13"
+    GtkButton::inner-border = { 7, 7, 3, 4 }
 
-    GtkWidget::draw-border = { 2, 2, 2, 2 }
-    GtkWidget::focus-line-width = 1
-    GtkButton::inner-border = { 8, 8, 0, 3 }
-
-    engine "quartz" {
-        buttontype = "aqua"
+    engine "xamarin" {
+        default_button_color = "#51ADF3"
     }
 }
 
@@ -435,10 +428,10 @@ class "GtkScale" style "scale"
 widget "*search-entry*" style "search-entry"
 widget "*GtkTextView" style "entry"
 
+widget_class "*.GtkButton.*" style "button"
 widget_class "<GtkDialog>.*.<GtkButton>" style "dialog-button"
 widget_class "<GtkDialog>*<GtkCheckButton>" style "radio-or-check-box"
-widget_class "<GtkDialog>.<GtkVBox>.<GtkButtonBox>.<GtkButton>*" style "dialog-button"
-widget_class "<GtkDialog>.<GtkVBox>.<GtkHBox>.<GtkButtonBox>.<GtkButton>*" style "dialog-button"
+widget_class "<GtkDialog>.*.<GtkButtonBox>.*.<GtkButton>.*" style "dialog-button"
 widget "*.toggleFindInFiles" style "toggle-button"
 widget "*.toggleReplaceInFiles" style "toggle-button"
 widget "wizard_dialog" style "wizard-dialog"