Prelim: Fix up toggle buttons

This commit is contained in:
Rory Fewell
2023-02-02 23:01:02 +00:00
parent 3e4a346dd9
commit 144bd668ff
7 changed files with 58 additions and 64 deletions

View File

@@ -160,10 +160,12 @@ button
min-width: 24px;
}
&.text-button
// NOTE: WinTC addition
//
&:not(.text-button)
{
padding-left: 8px;
padding-right: 8px;
padding-left: 0px;
padding-right: 0px;
}
@at-root %button_basic_drop_active,

View File

@@ -32,6 +32,16 @@ $button_styles:
undefined,
url('../Resources/button_border.png')
);
$button_styles:
wintc_define_props_box(
$button_styles,
true,
padding,
0,
8,
0,
8
);
$button_focused_styles:
wintc_define_props_bg(
@@ -154,9 +164,9 @@ $toggle_button_styles:
true,
padding,
1,
9,
1,
1,
1
9
);
$toggle_button_selected_styles:
@@ -210,9 +220,9 @@ $toggle_button_press_styles:
true,
padding,
2,
8,
0,
0,
2
10
);

View File

@@ -42,9 +42,9 @@ $start_flag_styles:
$start_flag_styles,
true,
margin,
undefined,
0,
2,
undefined,
0,
-1
);
@@ -66,10 +66,20 @@ $start_button_styles:
true,
margin,
4,
undefined,
0,
4,
2
);
$start_button_styles:
wintc_define_props_box(
$start_button_styles,
true,
padding,
1,
1,
1,
1
);
$start_button_styles:
wintc_define_props_fg(
$start_button_styles,
@@ -87,9 +97,9 @@ $start_button_styles:
bold
);
$start_button_selected_styles:
$start_button_press_styles:
wintc_define_props_box(
$start_button_selected_styles,
$start_button_press_styles,
true,
padding,
2,
@@ -98,13 +108,25 @@ $start_button_selected_styles:
2
);
$start_button_selected_styles: map-clone($start_button_press_styles);
$start_button_selected_styles:
wintc_define_props_bg(
$start_button_selected_styles,
true,
$threed_objects_bg,
undefined,
undefined,
undefined,
none
);
$start_button_text_styles:
wintc_define_props_box(
$start_button_text_styles,
true,
margin,
undefined,
undefined,
1,
undefined,
undefined
);

View File

@@ -134,28 +134,8 @@ $button_inactive_styles:
// TOGGLE BUTTON
//
$toggle_button_styles: map-clone($button_styles);
$toggle_button_styles:
wintc_define_props_box(
$toggle_button_styles,
false,
padding,
0,
0,
0,
0
);
$toggle_button_press_styles: map-clone($button_press_styles);
$toggle_button_press_styles:
wintc_define_props_box(
$toggle_button_press_styles,
false,
padding,
0,
0,
0,
0
);
$toggle_button_hover_styles: $button_hover_styles;
$toggle_button_selected_styles: $button_press_styles;

View File

@@ -85,10 +85,10 @@ $start_button_styles:
$start_button_styles,
false,
padding,
undefined,
undefined,
undefined,
undefined
0,
0,
0,
0
);
$start_button_styles:
wintc_define_props_fg(

View File

@@ -130,28 +130,8 @@ $button_inactive_styles:
// TOGGLE BUTTONS
//
$toggle_button_styles: map-clone($button_styles);
$toggle_button_styles:
wintc_define_props_box(
$toggle_button_styles,
false,
padding,
0,
0,
0,
0
);
$toggle_button_press_styles: map-clone($button_press_styles);
$toggle_button_press_styles:
wintc_define_props_box(
$toggle_button_press_styles,
false,
padding,
0,
0,
0,
0
);
$toggle_button_hover_styles: $button_hover_styles;
$toggle_button_selected_styles: $button_press_styles;

View File

@@ -25,15 +25,15 @@ $start_flag_styles:
0px -1px,
default
);
$start_flag_styles: // FIXME: May need adjusting when native is default
$start_flag_styles:
wintc_define_props_box(
$start_flag_styles,
false,
margin,
undefined,
0,
undefined,
0
undefined,
undefined
);
$start_button_styles:
@@ -73,10 +73,10 @@ $start_button_styles:
$start_button_styles,
false,
padding,
undefined,
undefined,
undefined,
undefined
0,
0,
0,
0
);
$start_button_hover_styles: