Prelim: Style menus

themes/gtk-3.0-base/colors/menu.scss

@@ -7,5 +7,5 @@
  * Author(s): Rory Fewell <roryf@oddmatics.uk>
  */
 
-$menu_color:         $menu_bg !default;
+$menu_color:         $menu_bg  !default;
 $menu_borders_color: $bg_color !default;

themes/gtk-3.0-base/common/checkradio.scss

@@ -262,7 +262,11 @@ radio
         &:checked,
         &:indeterminate
         {
-            -gtk-icon-source: url("../Resources/checkbox_check_glyph_menu.png");
+            &,
+            &:disabled
+            {
+                -gtk-icon-source: url("../Resources/checkbox_check_glyph_menu.png");
+            }
 
             &:hover
             {

themes/gtk-3.0-base/common/menu.scss

@@ -22,12 +22,14 @@
 menubar,
 .menubar
 {
-    padding:       0px;
+    @include __wintc_apply_props($menustrip_styles);
+
     -GtkWidget-window-dragging: true;
 
     > menuitem
     {
-        padding: 2px 6px 3px;
+        @include __wintc_apply_props($menustrip_menuitem_styles);
+
 
         // Remove padding and rounding from menubar submenus
         //
@@ -47,8 +49,7 @@ menubar,
         //
         &:hover
         {
-            background-color: $selected_bg_color;
-            color:            $selected_fg_color;
+            @include __wintc_apply_props($menustrip_menuitem_hover_styles);
         }
     }
 
@@ -74,24 +75,22 @@ menu,
 .menu,
 .context-menu
 {
-    background-color:   $menu_color;
-    border:             1px solid $menu_borders_color;
+    @include __wintc_apply_props($popup_menu_styles);
 
     menuitem
     {
-        margin:     2px 4px 2px;
-        min-height: 16px;
-        padding:    2px 6px;
+        @include __wintc_apply_props($popup_menu_menuitem_styles);
+
+        min-height: $popup_menu_menuitem_height;
 
         &:hover
         {
-            background-color: $selected_bg_color;
-            color:            $selected_fg_color;
+            @include __wintc_apply_props($popup_menu_menuitem_hover_styles);
         }
 
         &:disabled
         {
-            color: $insensitive_fg_color;
+            @include __wintc_apply_props($popup_menu_menuitem_inactive_styles);
         }
 
         &:first-child
@@ -108,8 +107,8 @@ menu,
         //
         arrow
         {
-            min-height: 16px;
-            min-width: 16px;
+            min-height: $popup_menu_menuitem_height;
+            min-width:  $popup_menu_menuitem_height;
 
             &:dir(ltr)
             {
@@ -185,9 +184,9 @@ menu,
     //
     > separator
     {
-        background-color: $menu_borders_color;
-        margin:           2px 4px;
-        min-height:       1px;
+        @include __wintc_apply_props($menu_separator_styles);
+
+        min-height: $menu_separator_height;
     }
 }
 
@@ -201,8 +200,8 @@ menuitem
     check,
     radio
     {
-        min-height: 16px;
-        min-width:  16px;
+        min-height: $popup_menu_menuitem_height;
+        min-width:  $popup_menu_menuitem_height;
 
         &:dir(ltr) { margin-right: 7px; }
         &:dir(rtl) { margin-left: 7px;  }
@@ -223,28 +222,31 @@ menuitem
 // I couldn't resolve this inconsistency so have chosen to instead drop the sub-menu
 // anims for the time being
 //
-.context-menu
+@if $popup_menu_fadein == true
 {
-    animation-duration: 300ms;
-    animation-name:     menu-fadein;
-}
-
-menubar,
-.menubar
-{
-    & > menuitem
+    .context-menu
     {
-        & > * > menu,
-        & > * > .menu
+        animation-duration: 300ms;
+        animation-name:     menu-fadein;
+    }
+
+    menubar,
+    .menubar
+    {
+        & > menuitem
         {
-            animation-name: empty;
-        }
-        
-        &:hover > * > menu,
-        &:hover > * > .menu
-        {
-            animation-duration: 300ms;
-            animation-name:     menu-fadein;
+            & > * > menu,
+            & > * > .menu
+            {
+                animation-name: empty;
+            }
+
+            &:hover > * > menu,
+            &:hover > * > .menu
+            {
+                animation-duration: 300ms;
+                animation-name:     menu-fadein;
+            }
         }
     }
 }

themes/gtk-3.0-base/init/_all.scss

@@ -16,3 +16,4 @@
 @import "combobox";
 @import "scale";
 @import "progressbar";
+@import "menu";

themes/gtk-3.0-base/init/menu.scss

@@ -0,0 +1,27 @@
+/**
+ * menu.scss - WinTC Menu Theme Part Definitions
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+//
+// MENUSTRIP
+//
+$menustrip_styles:                ();
+
+$menustrip_menuitem_styles:       ();
+$menustrip_menuitem_hover_styles: ();
+
+//
+// POPUP MENUS
+//
+$popup_menu_styles: ();
+
+$popup_menu_menuitem_styles:          ();
+$popup_menu_menuitem_hover_styles:    ();
+$popup_menu_menuitem_inactive_styles: ();
+
+$menu_separator_styles: ();

themes/gtk-3.0-base/styling/_all.scss

@@ -16,3 +16,4 @@
 @import "combobox";
 @import "scale";
 @import "progressbar";
+@import "menu";

themes/gtk-3.0-base/styling/menu.scss

@@ -0,0 +1,151 @@
+/**
+ * menu.scss - Theme Base Menu Style Constants
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+$menu_separator_height:      2px  !default;
+$popup_menu_fadein:          true !default;
+$popup_menu_menuitem_height: 16px !default;
+
+
+//
+// MENUSTRIP
+//
+$menustrip_styles:
+    wintc_define_props_box(
+        $menustrip_styles,
+        true,
+        padding,
+        0,
+        0,
+        0,
+        0
+    );
+
+$menustrip_menuitem_styles:
+    wintc_define_props_box(
+        $menustrip_menuitem_styles,
+        true,
+        padding,
+        2,
+        6,
+        3,
+        6
+    );
+
+$menustrip_menuitem_hover_styles:
+    wintc_define_props_bg(
+        $menustrip_menuitem_hover_styles,
+        true,
+        $selected_bg_color,
+        undefined,
+        undefined,
+        undefined,
+        undefined
+    );
+$menustrip_menuitem_hover_styles:
+    wintc_define_props_fg(
+        $menustrip_menuitem_hover_styles,
+        true,
+        $selected_fg_color,
+        undefined
+    );
+
+
+//
+// POPUP MENUS
+//
+$popup_menu_styles:
+    wintc_define_props_bg(
+        $popup_menu_styles,
+        true,
+        $menu_color,
+        undefined,
+        undefined,
+        undefined,
+        undefined
+    );
+$popup_menu_styles:
+    wintc_define_props_borders(
+        $popup_menu_styles,
+        true,
+        solid,
+        2,
+        2,
+        2,
+        2,
+        undefined,
+        url('../Resources/popup_menu_border.png')
+    );
+
+$popup_menu_menuitem_styles:
+    wintc_define_props_box(
+        $popup_menu_menuitem_styles,
+        true,
+        margin,
+        2,
+        4,
+        2,
+        4
+    );
+$popup_menu_menuitem_styles:
+    wintc_define_props_box(
+        $popup_menu_menuitem_styles,
+        true,
+        padding,
+        2,
+        6,
+        2,
+        6
+    );
+
+$popup_menu_menuitem_hover_styles:
+    wintc_define_props_bg(
+        $popup_menu_menuitem_hover_styles,
+        true,
+        $selected_bg_color,
+        undefined,
+        undefined,
+        undefined,
+        undefined
+    );
+$popup_menu_menuitem_hover_styles:
+    wintc_define_props_fg(
+        $popup_menu_menuitem_hover_styles,
+        true,
+        $selected_fg_color,
+        undefined
+    );
+
+$popup_menu_menuitem_inactive_styles:
+    wintc_define_props_fg(
+        $popup_menu_menuitem_inactive_styles,
+        true,
+        $insensitive_fg_color,
+        undefined
+    );
+
+$menu_separator_styles:
+    wintc_define_props_bg(
+        $menu_separator_styles,
+        true,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        url('../Resources/menu_separator.png')
+    );
+$menu_separator_styles:
+    wintc_define_props_box(
+        $menu_separator_styles,
+        true,
+        margin,
+        2,
+        4,
+        2,
+        4
+    );

themes/luna/blue/gtk-3.0/colors/_all.scss

@@ -8,3 +8,4 @@
  */
 
 @import "borders";
+@import "menu";

themes/luna/blue/gtk-3.0/colors/menu.scss

@@ -0,0 +1,10 @@
+/**
+ * menu.scss - Luna (Blue) Menu Colour Constants
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+$menu_borders_color: #ACA889;

themes/luna/blue/gtk-3.0/styling/_all.scss

@@ -16,3 +16,4 @@
 @import "combobox";
 @import "scale";
 @import "progressbar";
+@import "menu";

themes/luna/blue/gtk-3.0/styling/menu.scss

@@ -0,0 +1,37 @@
+/**
+ * menu.scss - Luna (Blue) Style Menu Style Constants
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+$menu_separator_height: 1px;
+
+//
+// POPUP MENUS
+//
+$popup_menu_styles:
+    wintc_define_props_borders(
+        $popup_menu_styles,
+        false,
+        solid,
+        1,
+        1,
+        1,
+        1,
+        $menu_borders_color,
+        undefined
+    );
+
+$menu_separator_styles:
+    wintc_define_props_bg(
+        $menu_separator_styles,
+        false,
+        $menu_borders_color,
+        undefined,
+        undefined,
+        undefined,
+        undefined
+    );

themes/professional/Resources/checkbox_check_glyph_menu_hover.png

@@ -0,0 +1 @@
+checkbox_check_glyph_menu.png

themes/professional/gtk-3.0/colors/_all.scss

@@ -8,3 +8,4 @@
  */
 
 @import "borders";
+@import "menu";

themes/professional/gtk-3.0/colors/menu.scss

@@ -0,0 +1,10 @@
+/**
+ * menu.scss - Professional Style Menu Colour Constants
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+$menu_borders_color: #808080;

themes/professional/gtk-3.0/styling/_all.scss

@@ -15,3 +15,4 @@
 @import "combobox";
 @import "scale";
 @import "progressbar";
+@import "menu";

themes/professional/gtk-3.0/styling/menu.scss

@@ -0,0 +1,126 @@
+/**
+ * menu.scss - Professional Style Menu Style Constants
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+$menu_separator_height: 1px;
+
+//
+// MENUSTRIP
+//
+$menustrip_menuitem_styles:
+    wintc_define_props_borders(
+        $menustrip_menuitem_styles,
+        false,
+        solid,
+        1,
+        1,
+        1,
+        1,
+        transparent,
+        undefined
+    );
+
+$menustrip_menuitem_hover_styles:
+    wintc_define_props_bg(
+        $menustrip_menuitem_hover_styles,
+        false,
+        #CED3E1,
+        undefined,
+        undefined,
+        undefined,
+        undefined
+    );
+$menustrip_menuitem_hover_styles:
+    wintc_define_props_borders(
+        $menustrip_menuitem_hover_styles,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        #316AC5,
+        undefined
+    );
+$menustrip_menuitem_hover_styles:
+    wintc_define_props_fg(
+        $menustrip_menuitem_hover_styles,
+        false,
+        undefined,
+        undefined
+    );
+
+//
+// POPUP MENUS
+//
+$popup_menu_styles:
+    wintc_define_props_borders(
+        $popup_menu_styles,
+        false,
+        solid,
+        1,
+        1,
+        1,
+        1,
+        $menu_borders_color,
+        undefined
+    );
+
+$popup_menu_menuitem_styles:
+    wintc_define_props_borders(
+        $popup_menu_menuitem_styles,
+        false,
+        solid,
+        1,
+        1,
+        1,
+        1,
+        transparent,
+        undefined
+    );
+
+$popup_menu_menuitem_hover_styles:
+    wintc_define_props_bg(
+        $popup_menu_menuitem_hover_styles,
+        false,
+        #CED3E1,
+        undefined,
+        undefined,
+        undefined,
+        undefined
+    );
+$popup_menu_menuitem_hover_styles:
+    wintc_define_props_borders(
+        $popup_menu_menuitem_hover_styles,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        #316AC5,
+        undefined
+    );
+$popup_menu_menuitem_hover_styles:
+    wintc_define_props_fg(
+        $popup_menu_menuitem_hover_styles,
+        false,
+        undefined,
+        undefined
+    );
+
+$menu_separator_styles:
+    wintc_define_props_bg(
+        $menu_separator_styles,
+        false,
+        $menu_borders_color,
+        undefined,
+        undefined,
+        undefined,
+        undefined
+    );