rozniak/xfce-winxp-tc
1
0
Fork 0
mirror of https://github.com/rozniak/xfce-winxp-tc.git synced 2026-01-26 11:39:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Fixes #334, Separator styles, including menubar/toolbar borders, are missing

Browse Source
This commit is contained in:
Rory Fewell
2024-07-01 23:53:49 +01:00
parent 85f9a55288
commit d631fe58f1
25 changed files with 238 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
themes/build-common/gtk-3.0-base/common/frame.scss
View File

@@ -121,10 +121,22 @@ scrolledwindow
}
// vbox and hbox separators
// RORY: Default to horizontal styles, and only override for vertical - the
// common use-case is horizontal (eg. menus)
//
separator
{
@include __wintc_apply_props($separator_styles);
@include __wintc_apply_props($separator_horz_styles);
min-height: $separator_thickness;
min-width: $separator_thickness;
}
// Direct descendant selector so we don't screw up menus from like horizontal
// menu bar that pops out a menu (which always has vertical orientation)
//
.horizontal > separator
{
@include __wintc_apply_props($separator_vert_styles);
}

5
themes/build-common/gtk-3.0-base/common/menu.scss
View File

@@ -26,6 +26,11 @@ menubar,
-GtkWidget-window-dragging: true;
box.vertical > &:last-child
{
border-bottom-style: none;
}
> menuitem
{
@include __wintc_apply_props($menustrip_menuitem_styles);

10
themes/build-common/gtk-3.0-base/common/toolbar.scss
View File

@@ -18,8 +18,18 @@ toolbar
{
@extend %toolbar;
@include __wintc_apply_props($toolbar_styles);
padding: 4px 3px 3px 4px;
// RORY: This is an attempt to avoid weird borders on frames... see
// issue #334
//
box.vertical > &:last-child
{
border-bottom-style: none;
}
// On OSD
//
.osd &

1
themes/build-common/gtk-3.0-base/init/_all.scss
View File

@@ -18,6 +18,7 @@
@import "progressbar";
@import "frame";
@import "menu";
@import "toolbar";
@import "scrollbar";
@import "notebook";
@import "csd";

3
themes/build-common/gtk-3.0-base/init/frame.scss
View File

@@ -16,4 +16,5 @@ $frame_label_styles: ();
//
// SEPARATOR
//
$separator_styles: ();
$separator_horz_styles: ();
$separator_vert_styles: ();

13
themes/build-common/gtk-3.0-base/init/toolbar.scss Normal file
View File

@@ -0,0 +1,13 @@
/**
* toolbar.scss - WinTC Toolbar 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>
*/
//
// TOOLBAR
//
$toolbar_styles: ();

1
themes/build-common/gtk-3.0-base/styling/_all.scss
View File

@@ -15,6 +15,7 @@
@import "progressbar";
@import "frame";
@import "menu";
@import "toolbar";
@import "scrollbar";
@import "notebook";
@import "csd";

17
themes/build-common/gtk-3.0-base/styling/frame.scss
View File

@@ -28,13 +28,24 @@ $frame_label_styles:
//
// SEPARATOR
//
$separator_styles:
$separator_styles: ();
$separator_horz_styles:
wintc_define_props_bg(
$separator_styles,
$separator_horz_styles,
true,
undefined,
undefined,
undefined,
undefined,
url('../Resources/separator.png')
url('../Resources/separator_horz.png')
);
$separator_vert_styles:
wintc_define_props_bg(
$separator_vert_styles,
true,
undefined,
undefined,
undefined,
undefined,
url('../Resources/separator_vert.png')
);

12
themes/build-common/gtk-3.0-base/styling/menu.scss
View File

@@ -26,6 +26,18 @@ $menustrip_styles:
0,
0
);
$menustrip_styles:
wintc_define_props_borders(
$menustrip_styles,
true,
solid,
0,
0,
2,
0,
undefined,
url('../Resources/separator_horz.png')
);
$menustrip_menuitem_styles:
wintc_define_props_box(

24
themes/build-common/gtk-3.0-base/styling/toolbar.scss Normal file
View File

@@ -0,0 +1,24 @@
/**
* toolbar.scss - Theme Base Toolbar Style Constants
*
* This source-code is part of Windows XP stuff for XFCE:
* <<https://www.oddmatics.uk>>
*
* Author(s): Rory Fewell <roryf@oddmatics.uk>
*/
//
// TOOLBAR
//
$toolbar_styles:
wintc_define_props_borders(
$toolbar_styles,
true,
solid,
0,
0,
2,
0,
undefined,
url('../Resources/separator_horz.png')
);

BIN
themes/luna/blue/Resources/toolbar_border.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 472 B

1
themes/luna/blue/gtk-3.0/styling/_all.scss
View File

@@ -15,6 +15,7 @@
@import "progressbar";
@import "frame";
@import "menu";
@import "toolbar";
@import "scrollbar";
@import "notebook";
@import "csd";

5
themes/luna/blue/gtk-3.0/styling/frame.scss
View File

@@ -29,9 +29,12 @@ $separator_styles:
wintc_define_props_bg(
$separator_styles,
false,
$menu_borders_color,
#CAC6AF,
undefined,
undefined,
undefined,
undefined
);
$separator_horz_styles: ();
$separator_vert_styles: ();

16
themes/luna/blue/gtk-3.0/styling/menu.scss
View File

@@ -9,6 +9,22 @@
$menu_separator_thickness: $separator_thickness;
//
// MENUSTRIP
//
$menustrip_styles:
wintc_define_props_borders(
$menustrip_styles,
false,
solid,
0,
0,
2,
0,
undefined,
url('../Resources/toolbar_border.png')
);
//
// POPUP MENUS
//

26
themes/luna/blue/gtk-3.0/styling/toolbar.scss Normal file
View File

@@ -0,0 +1,26 @@
/**
* toolbar.scss - Luna (Blue) Style Toolbar 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_thickness: $separator_thickness;
//
// TOOLBAR
//
$toolbar_styles:
wintc_define_props_borders(
$toolbar_styles,
false,
solid,
0,
0,
2,
0,
undefined,
url('../Resources/toolbar_border.png')
);

0
themes/native/Resources/separator.png → themes/native/Resources/separator_horz.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 475 B

After

Width:  |  Height:  |  Size: 475 B

BIN
themes/native/Resources/separator_vert.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 474 B

BIN
themes/professional/Resources/toolbar_border.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 497 B

1
themes/professional/gtk-3.0/colors/_all.scss
View File

@@ -9,3 +9,4 @@
@import "borders";
@import "menu";
@import "toolbar";

10
themes/professional/gtk-3.0/colors/toolbar.scss Normal file
View File

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

1
themes/professional/gtk-3.0/styling/_all.scss
View File

@@ -15,6 +15,7 @@
@import "progressbar";
@import "frame";
@import "menu";
@import "toolbar";
@import "scrollbar";
@import "notebook";
@import "csd";

4
themes/professional/gtk-3.0/styling/frame.scss
View File

@@ -16,9 +16,11 @@ $separator_styles:
wintc_define_props_bg(
$separator_styles,
false,
$menu_borders_color,
#BDBDB7,
undefined,
undefined,
undefined,
undefined
);
$separator_horz_styles: ();
$separator_vert_styles: ();

23
themes/professional/gtk-3.0/styling/menu.scss
View File

@@ -12,6 +12,29 @@ $menu_separator_thickness: $separator_thickness;
//
// MENUSTRIP
//
$menustrip_styles:
wintc_define_props_bg(
$menustrip_styles,
false,
$toolbar_bg_color,
undefined,
undefined,
undefined,
undefined
);
$menustrip_styles:
wintc_define_props_borders(
$menustrip_styles,
false,
solid,
2,
2,
2,
2,
undefined,
url('../Resources/toolbar_border.png')
);
$menustrip_menuitem_styles:
wintc_define_props_borders(
$menustrip_menuitem_styles,

25
themes/professional/gtk-3.0/styling/start-menu.scss
View File

@@ -179,6 +179,31 @@ $start_menu_styles:
undefined
);
// Clear out default menubar styles
//
$start_menu_menustrip_styles:
wintc_define_props_bg(
$start_menu_menustrip_styles,
false,
unset,
undefined,
undefined,
undefined,
undefined
);
$start_menu_menustrip_styles:
wintc_define_props_borders(
$start_menu_menustrip_styles,
false,
none,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined
);
$start_menu_menustrip_menuitem_styles:
wintc_define_props_borders(
$start_menu_menustrip_menuitem_styles,

34
themes/professional/gtk-3.0/styling/toolbar.scss Normal file
View File

@@ -0,0 +1,34 @@
/**
* toolbar.scss - Professional Style Toolbar Style Constants
*
* This source-code is part of Windows XP stuff for XFCE:
* <<https://www.oddmatics.uk>>
*
* Author(s): Rory Fewell <roryf@oddmatics.uk>
*/
//
// TOOLBAR
//
$toolbar_styles:
wintc_define_props_bg(
$toolbar_styles,
false,
$toolbar_bg_color,
undefined,
undefined,
undefined,
undefined
);
$toolbar_styles:
wintc_define_props_borders(
$toolbar_styles,
false,
solid,
2,
2,
2,
2,
undefined,
url('../Resources/toolbar_border.png')
);