[Win] Gtk theme redesign

* remove obsolete wimp engine
* mimic native design using xamarin-gtk-theme
* remove gradients where possible
* remove broken gtkrc style matches
* requires xamarin-gtk-theme update

1 files changed, 158 insertions, 76 deletions

diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.win32 b/main/src/core/MonoDevelop.Ide/gtkrc.win32
index c621bd221b..fa067f1488 100644
--- a/main/src/core/MonoDevelop.Ide/gtkrc.win32
+++ b/main/src/core/MonoDevelop.Ide/gtkrc.win32
@@ -37,69 +37,73 @@ style "default" {
     ythickness = 1
 
     ### colours
-    bg[NORMAL] = @bg_color
-    bg[PRELIGHT] = @bg_color
-    bg[SELECTED] = @selected_bg_color
+    bg[NORMAL]      = @bg_color
+    bg[PRELIGHT]    = @bg_color
+    bg[SELECTED]    = @selected_bg_color
     bg[INSENSITIVE] = @bg_color
-    bg[ACTIVE] = @bg_color
+    bg[ACTIVE]      = @bg_color
 
-    fg[NORMAL] = @fg_color
-    fg[PRELIGHT] = @fg_color
-    fg[SELECTED] = @selected_fg_color
+    fg[NORMAL]      = @fg_color
+    fg[PRELIGHT]    = @fg_color
+    fg[SELECTED]    = @selected_fg_color
     fg[INSENSITIVE] = darker (@bg_color)
-    fg[ACTIVE] = @fg_color
+    fg[ACTIVE]      = @fg_color
 
-    text[NORMAL] = @text_color
-    text[PRELIGHT] = @text_color
-    text[SELECTED] = @selected_fg_color
+    text[NORMAL]      = @text_color
+    text[PRELIGHT]    = @text_color
+    text[SELECTED]    = @selected_fg_color
     text[INSENSITIVE] = darker (@bg_color)
-    text[ACTIVE] = @text_color
+    text[ACTIVE]      = @text_color
 
-    base[NORMAL] = @base_color
-    base[PRELIGHT] = @selected_bg_color
-    base[SELECTED] = @selected_bg_color
+    base[NORMAL]      = @base_color
+    base[PRELIGHT]    = @selected_bg_color
+    base[SELECTED]    = @selected_bg_color
     base[INSENSITIVE] = @bg_color
-    base[ACTIVE] = shade (1.3, @selected_bg_color)
+    base[ACTIVE]      = shade (1.3, @selected_bg_color)
 
     ### style properties
     GtkWidget::new-tooltip-style = 1
 
-    GtkEntry::honors-transparent-bg-hint = 1
+    GtkEntry::honors-transparent-bg-hint = 1    # transparent search box background
     GtkEntry::inner-border = { 2, 2, 2, 2 }
 
     GtkButton::child-displacement-x = 0
     GtkButton::child-displacement-y = 0
     GtkButton::default-border = { 0, 0, 0, 0 }
-    GtkButton::inner-border = { 2, 2, 2, 2 }
+    GtkButton::inner-border = { 2, 2, 4, 4 }
 
-    GtkTreeView::odd-row-color = @base_color
+    GtkTreeView::odd-row-color = @bg_color
 
     GtkScrolledWindow::scrollbar-spacing = 0
+    GtkScrolledWindow::scrollbars-within-bevel = 1
     GtkScale::slider-length = 14
 
-    GtkMenu::horizontal-padding = 3
-    GtkMenu::vertical-padding = 3
+    GtkMenu::horizontal-padding = 1
+    GtkMenu::vertical-padding = 1
     GtkMenuItem::horizontal-padding = 2
-    GtkSeparatorMenuItem::horizontal-padding = 2
+    GtkSeparatorMenuItem::horizontal-padding = 0
 
     GtkTreeView::expander-size = 8
     GtkExpander::expander-size = 8
     GtkComboBox::arrow-size = 8
+    GtkComboBox::appears-as-list = 0
 
     engine "xamarin" {
-        arrowstyle = 2
+        arrowstyle = 3
         rgba = TRUE
-        roundness = 3
+        roundness = 0
         glazestyle = 0
+        highlight_shade = 1.0
 
         menustyle = 0
         menuitemstyle = 0
         menubaritemstyle = 0
-        comboboxstyle = 1
+        comboboxstyle = 0
         spinbuttonstyle = 1
         colorize_scrollbar = FALSE
         progressbarstyle = 0
         trough_shades = { 0.842, 0.886 }
+        gradient_shades = { 1.0, 1.0, 1.0, 1.0}
     }
 }
 
@@ -113,11 +117,29 @@ style "wider" = "default" {
     ythickness = 3
 }
 
-style "button" {
+style "button" = "default" {
     xthickness = 2
-    ythickness = 1
+    ythickness = 4
+
+    bg[NORMAL] = "#e1e1e1"
+    bg[PRELIGHT] = "#bee6fd"
+    bg[ACTIVE] = "#c4e5f6"
+    bg[SELECTED] = "#ADADAD"
+    
+    fg[SELECTED] = @fg_color
 
-    engine "wimp" {
+    GtkWidget::draw-border = { 1, 1, 1, 1 }
+    GtkWidget::focus-padding = 0
+    GtkWidget::focus-line-width = 1
+
+    engine "xamarin" {
+        rgba = FALSE
+        roundness = 0
+        contrast = 1.0
+        focus_color = "#3c7fb1"
+        focusstyle = 3
+        textstyle = 0
+        fill_shade = 1.0
     }
 }
 
@@ -125,15 +147,30 @@ style "menu" = "default" {
     xthickness = 0
     ythickness = 0
 
-    engine "wimp" {
-    }
+    fg[PRELIGHT]    = @selected_fg_color
+    text[PRELIGHT]  = @selected_fg_color
+}
+
+style "menubar" = "default" {
+    xthickness = 5
+    ythickness = 3
 }
 
-style "menu-item" = "default" {
+style "menu-item" = "menu" {
     xthickness = 5
     ythickness = 3
 
-    engine "wimp" {
+    engine "xamarin" {
+        arrowstyle = 2
+        contrast = 0.0
+    }
+}
+
+style "menu-separator" = "menu-item" {
+    xthickness = 0
+    ythickness = 2
+    engine "xamarin" {
+        contrast = 1.0
     }
 }
 
@@ -162,34 +199,26 @@ style "tooltip"
     fg[NORMAL] = @tooltip_fg_color
     bg[NORMAL] = @tooltip_bg_color
     bg[SELECTED] = @tooltip_border_color
-
-    engine "xamarin" {
-    	roundness = 0
-    }
 }
 
 style "treeview" = "default"
 {
-    GtkTreeView::odd-row-color = "#f5f5f5"
-
-    base[SELECTED] = "#bcd0d4"
-    base[ACTIVE] = "#bcd0d4"
-    text[SELECTED] = "#000"
+    base[ACTIVE] = @selected_bg_color
+    text[ACTIVE] = @selected_fg_color
 
     engine "xamarin" {
-        roundness = 0
-        gradient_shades = {1.0, 0.95, 0.95, 0.90}
-        glazestyle = 1
+		glazestyle = 1
     }
 }
 
 style "tree-header" = "wide"
 {
-    bg[NORMAL] = "#f2f2f2"
+    bg[NORMAL]   = "#f2f2f2"
+    bg[PRELIGHT] = "#d9ebf9"
+    bg[ACTIVE]   = "#bcdcf4"
 
     engine "xamarin" {
-        listviewheaderstyle = 3
-        separatorstyle = 1
+        focusstyle = 0
     }
 }
 
@@ -201,31 +230,46 @@ style "icon-view" = "default"
     text[SELECTED] = "#000"
 }
 
-style "toolbar-combo-box" = "default"
+style "toolbar-combo-box" = "button"
 {
-    fg[NORMAL] = @fg_color
-    text[NORMAL] = @fg_color
-    bg[NORMAL] = "#fff"
-    base[NORMAL] = "#fff"
+    bg[NORMAL] = @base_color
+    base[NORMAL] = @base_color
 
-    engine "wimp" {
-        comboboxstyle = 0
-        arrowstyle = 2
+    ythickness = 4
+    xthickness = 2
+    GtkWidget::focus-padding = 0
+
+    engine "xamarin" {
+        roundness = 3
     }
 }
 
 style "combo-box" = "default"
+ {
+    bg[NORMAL] = @base_color
+    bg[ACTIVE] = @base_color
+    ythickness = 0
+    xthickness = 0
+}
+
+style "combo-box-button" = "button"
 {
-    fg[NORMAL] = "#616161"
+    bg[PRELIGHT] = @base_color
+    base[PRELIGHT] = "#ADADAD"
+    bg[ACTIVE] = "#ADADAD"
+}
 
-    engine "wimp" {
-        arrowstyle = 3
-    }
+style "combo-box-entry" = "entry"
+{
+    xthickness = 0
+    ythickness = 0
 }
 
-style "combo-box-label" = "combo-box"
+style "combo-box-entry-button" = "combo-box-button"
 {
-    fg[NORMAL] = "#595959"
+    xthickness = 4
+    ythickness = 4
+    GtkButton::inner-border = { 0, 0, 0, 0 }
 }
 
 style "notebook" = "default"
@@ -276,6 +320,13 @@ style "search-entry" = "wider"
     bg[NORMAL] = @base_color
 }
 
+style "search-entry-rounded" = "search-entry"
+{
+    engine "xamarin" {
+        roundness = 3
+    }
+}
+
 style "wizard-dialog"
 {
     GtkDialog::content-area-border = 0
@@ -283,10 +334,35 @@ style "wizard-dialog"
 
 style "scrollbar" = "default"
 {
-    GtkRange::slider-width = 7
-    GtkRange::trough-border = 2
+    GtkRange::slider-width = 14
+    GtkRange::trough-border = 0
+
+    bg[NORMAL]      = "#CDCDCD" # default slider/stepper color
+    bg[INSENSITIVE] = "#CDCDCD" # disabled slider/stepper color
+    bg[PRELIGHT]    = "#A6A6A6" # hover slider/stepper color
+    bg[ACTIVE]      = "#CDCDCD" # pressed stepper color
+
+    engine "xamarin"
+    {
+        contrast		= 0.0
+        border_colors	= { "#C0C0C0", "#C0C0C0" }
+        trough_shades	= { 1.026, 1.026 }
+        stepperstyle	= 1
+        arrowstyle		= 0
+    }
+}
+
+style "completion_scrollbar" = "scrollbar"
+{
+    GtkScrollbar::has-forward-stepper = 0
+    GtkScrollbar::has-backward-stepper = 0
+    GtkRange::slider-width = 9
+
+	bg[NORMAL] = @bg_color
 
-    engine "wimp" {
+    engine "xamarin"
+    {
+        trough_shades	= { 0.97, 0.97 }
     }
 }
 
@@ -326,6 +402,7 @@ class "GtkProgressBar" style "progressbar"
 class "GtkScrolledWindow" style "scrolled-window"
 class "GtkNotebook" style "notebook"
 class "GtkButton" style "button"
+class "GtkComboBox" style "combo-box"
 
 class "GtkRadioButton" style "radio-button"
 class "GtkCheckButton" style "check-box"
@@ -333,32 +410,37 @@ class "GtkScale" style "scale"
 
 widget "*GtkEntry" style:highest "entry"
 widget "*search-entry*" style "search-entry"
+widget_class "*Toolbar*.*SearchEntry*" style:highest "search-entry-rounded"
 
-widget_class "*<GtkButton>" style "button"
-widget "*.GtkToggleButton" style "button"
 widget "wizard_dialog" style "wizard-dialog"
 
+widget "*CompletionScrolledWindow*" style "completion_scrollbar"
+
 widget_class "*<GtkMenu>*" style "menu"
 widget_class "*<GtkMenuItem>*" style "menu-item"
+widget_class "*<GtkSeparatorMenuItem>*" style "menu-separator"
+widget_class "*<GtkMenuBar>" style "menubar"
 
 widget_class "*<GtkToolbar>*" style "toolbar"
 widget_class "*ToolButton*" style "toolbar-button"
 
 widget_class "*.<GtkTreeView>*" style "treeview"
-widget_class "*.GtkTreeView.GtkButton" style "tree-header"
-widget_class "*.GtkList.GtkButton" style "tree-header"
+widget_class "*.<GtkTreeView>.<GtkButton>" style "tree-header"
+widget_class "*.<GtkList>.<GtkButton>" style "tree-header"
 
 widget_class "*<GtkIconView>" style "icon-view"
 
-class "GtkComboBox" style "combo-box"
-widget_class "*.<GtkComboBox>.*" style "combo-box"
-widget_class "*.<GtkComboBoxText>.*" style "combo-box"
-widget_class "*.<GtkComboBoxEntry>.*" style "combo-box"
-widget_class "*.<GtkComboBoxText>.<GtkEntry>" style "entry"
-widget_class "*.<GtkComboBox>.*.GtkLabel" style "combo-box-label"
+widget_class "*<GtkComboBox>*" style "combo-box"
+widget_class "*.<GtkComboBox>*<GtkButton>*" style "combo-box-button"
+
+class "<GtkComboBoxEntry>" style "combo-box-entry"
+widget_class "*.<GtkComboBoxText>*<GtkEntry>" style "combo-box-entry"
+widget_class "*.<GtkComboBoxText>*<GtkButton>*" style "combo-box-entry-button"
+widget_class "*.<GtkComboBoxEntry>*<GtkEntry>" style "combo-box-entry"
+widget_class "*.<GtkComboBoxEntry>*<GtkButton>*" style "combo-box-entry-button"
 
 # Comboboxes within toolbars
-widget_class "*.<GtkToolbar>.*.<GtkComboBox>.*" style "toolbar-combo-box"
-widget "*MainToolbar*.GtkComboBox.*" style "toolbar-combo-box"
+widget_class "*.<GtkToolbar>.<GtkComboBox>.<GtkButton>" style "toolbar-combo-box"
+widget "*MainToolbar*.GtkComboBox.*" style:highest "toolbar-combo-box"
 
 widget "gtk-tooltip*" style "tooltip"