Rearranged all button appearance reading for logical purposes, better defaults.

This commit is contained in:
Dave Foster 2007-09-13 22:25:24 -04:00 committed by Mikael Magnusson
parent ef8108695f
commit 9bc70d9373

View file

@ -610,15 +610,30 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
}
/* read buttons textures */
READ_APPEARANCE("window.active.button.disabled.bg",
a_disabled_focused_tmp, TRUE);
READ_APPEARANCE("window.inactive.button.disabled.bg",
a_disabled_unfocused_tmp, TRUE);
/* bases: unpressed, pressed, disabled */
READ_APPEARANCE("window.active.button.unpressed.bg",
a_focused_unpressed_tmp, TRUE);
READ_APPEARANCE("window.inactive.button.unpressed.bg",
a_unfocused_unpressed_tmp, TRUE);
READ_APPEARANCE("window.active.button.pressed.bg",
a_focused_pressed_tmp, TRUE);
READ_APPEARANCE("window.inactive.button.pressed.bg",
a_unfocused_pressed_tmp, TRUE);
READ_APPEARANCE("window.active.button.disabled.bg",
a_disabled_focused_tmp, TRUE);
READ_APPEARANCE("window.inactive.button.disabled.bg",
a_disabled_unfocused_tmp, TRUE);
/* hover */
READ_APPEARANCE_COPY("window.active.button.hover.bg",
a_hover_focused_tmp, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button.hover.bg",
a_hover_unfocused_tmp, TRUE,
a_unfocused_unpressed_tmp);
/* toggled unpressed */
READ_APPEARANCE_("window.active.button.toggled.unpressed.bg",
"window.active.button.toggled.bg",
a_toggled_focused_unpressed_tmp, TRUE,
@ -628,13 +643,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
a_toggled_unfocused_unpressed_tmp, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg",
a_toggled_hover_focused_tmp, TRUE,
a_toggled_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg",
a_toggled_hover_unfocused_tmp, TRUE,
a_toggled_unfocused_unpressed_tmp);
/* toggled pressed */
READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg",
a_toggled_focused_pressed_tmp, TRUE,
a_focused_pressed_tmp);
@ -642,65 +651,84 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
a_toggled_unfocused_pressed_tmp, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE("window.active.button.unpressed.bg",
a_focused_unpressed_tmp, TRUE);
READ_APPEARANCE("window.inactive.button.unpressed.bg",
a_unfocused_unpressed_tmp, TRUE);
/* toggled hover */
READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg",
a_toggled_hover_focused_tmp, TRUE,
a_toggled_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg",
a_toggled_hover_unfocused_tmp, TRUE,
a_toggled_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button.hover.bg",
a_hover_focused_tmp, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button.hover.bg",
a_hover_unfocused_tmp, TRUE,
a_unfocused_unpressed_tmp);
/* now do individual buttons, if specified */
/* max button */
/* bases: unpressed, pressed, disabled */
READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg",
theme->a_focused_unpressed_max, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg",
theme->a_unfocused_unpressed_max, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-max.pressed.bg",
theme->a_focused_pressed_max, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg",
theme->a_unfocused_pressed_max, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button-max.disabled.bg",
theme->a_disabled_focused_max, TRUE,
a_disabled_focused_tmp);
READ_APPEARANCE_COPY("window.inactive.button-max.disabled.bg",
theme->a_disabled_unfocused_max, TRUE,
a_disabled_unfocused_tmp);
/* hover */
READ_APPEARANCE_COPY("window.active.button-max.hover.bg",
theme->a_hover_focused_max, TRUE,
a_hover_focused_tmp);
theme->a_focused_unpressed_max);
READ_APPEARANCE_COPY("window.inactive.button-max.hover.bg",
theme->a_hover_unfocused_max, TRUE,
a_hover_unfocused_tmp);
READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg",
theme->a_focused_unpressed_max, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-max.pressed.bg",
theme->a_focused_pressed_max, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg",
theme->a_unfocused_unpressed_max, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg",
theme->a_unfocused_pressed_max, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg",
theme->a_toggled_hover_focused_max, TRUE,
a_toggled_hover_focused_tmp);
READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg",
theme->a_toggled_hover_unfocused_max, TRUE,
a_toggled_hover_unfocused_tmp);
theme->a_unfocused_unpressed_max);
/* toggled unpressed */
READ_APPEARANCE_COPY("window.active.button-max.toggled.unpressed.bg",
theme->a_toggled_focused_unpressed_max, TRUE,
a_toggled_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg",
theme->a_toggled_focused_pressed_max, TRUE,
a_toggled_focused_pressed_tmp);
theme->a_focused_pressed_max);
READ_APPEARANCE_COPY("window.inactive.button-max.toggled.unpressed.bg",
theme->a_toggled_unfocused_unpressed_max, TRUE,
a_toggled_unfocused_unpressed_tmp);
theme->a_unfocused_pressed_max);
/* toggled pressed */
READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg",
theme->a_toggled_focused_pressed_max, TRUE,
theme->a_focused_pressed_max);
READ_APPEARANCE_COPY("window.inactive.button-max.toggled.pressed.bg",
theme->a_toggled_unfocused_pressed_max, TRUE,
a_toggled_unfocused_pressed_tmp);
theme->a_unfocused_pressed_max);
/* toggled hover */
READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg",
theme->a_toggled_hover_focused_max, TRUE,
theme->a_toggled_focused_unpressed_max);
READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg",
theme->a_toggled_hover_unfocused_max, TRUE,
theme->a_toggled_unfocused_unpressed_max);
/* close button */
READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg",
theme->a_focused_unpressed_close, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg",
theme->a_unfocused_unpressed_close, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-close.pressed.bg",
theme->a_focused_pressed_close, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg",
theme->a_unfocused_pressed_close, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button-close.disabled.bg",
theme->a_disabled_focused_close, TRUE,
a_disabled_focused_tmp);
@ -709,112 +737,132 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
a_disabled_unfocused_tmp);
READ_APPEARANCE_COPY("window.active.button-close.hover.bg",
theme->a_hover_focused_close, TRUE,
a_hover_focused_tmp);
theme->a_focused_unpressed_close);
READ_APPEARANCE_COPY("window.inactive.button-close.hover.bg",
theme->a_hover_unfocused_close, TRUE,
a_hover_unfocused_tmp);
READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg",
theme->a_focused_unpressed_close, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-close.pressed.bg",
theme->a_focused_pressed_close, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg",
theme->a_unfocused_unpressed_close, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg",
theme->a_unfocused_pressed_close, TRUE,
a_unfocused_pressed_tmp);
theme->a_unfocused_unpressed_close);
/* desk button */
/* bases: unpressed, pressed, disabled */
READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg",
theme->a_focused_unpressed_desk, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg",
theme->a_unfocused_unpressed_desk, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg",
theme->a_focused_pressed_desk, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg",
theme->a_unfocused_pressed_desk, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button-desk.disabled.bg",
theme->a_disabled_focused_desk, TRUE,
a_disabled_focused_tmp);
READ_APPEARANCE_COPY("window.inactive.button-desk.disabled.bg",
theme->a_disabled_unfocused_desk, TRUE,
a_disabled_unfocused_tmp);
/* hover */
READ_APPEARANCE_COPY("window.active.button-desk.hover.bg",
theme->a_hover_focused_desk, TRUE,
a_hover_focused_tmp);
theme->a_focused_unpressed_desk);
READ_APPEARANCE_COPY("window.inactive.button-desk.hover.bg",
theme->a_hover_unfocused_desk, TRUE,
a_hover_unfocused_tmp);
READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg",
theme->a_focused_unpressed_desk, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg",
theme->a_focused_pressed_desk, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg",
theme->a_unfocused_unpressed_desk, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg",
theme->a_unfocused_pressed_desk, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg",
theme->a_toggled_hover_focused_desk, TRUE,
a_toggled_hover_focused_tmp);
READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg",
theme->a_toggled_hover_unfocused_desk, TRUE,
a_toggled_hover_unfocused_tmp);
theme->a_unfocused_unpressed_desk);
/* toggled unpressed */
READ_APPEARANCE_COPY("window.active.button-desk.toggled.unpressed.bg",
theme->a_toggled_focused_unpressed_desk, TRUE,
a_toggled_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg",
theme->a_toggled_focused_pressed_desk, TRUE,
a_toggled_focused_pressed_tmp);
theme->a_focused_pressed_desk);
READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.unpressed.bg",
theme->a_toggled_unfocused_unpressed_desk, TRUE,
a_toggled_unfocused_unpressed_tmp);
theme->a_unfocused_pressed_desk);
/* toggled pressed */
READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg",
theme->a_toggled_focused_pressed_desk, TRUE,
theme->a_focused_pressed_desk);
READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.pressed.bg",
theme->a_toggled_unfocused_pressed_desk, TRUE,
a_toggled_unfocused_pressed_tmp);
theme->a_unfocused_pressed_desk);
/* toggled hover */
READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg",
theme->a_toggled_hover_focused_desk, TRUE,
theme->a_toggled_focused_unpressed_desk);
READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg",
theme->a_toggled_hover_unfocused_desk, TRUE,
theme->a_toggled_unfocused_unpressed_desk);
/* shade button */
/* bases: unpressed, pressed, disabled */
READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg",
theme->a_focused_unpressed_shade, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg",
theme->a_unfocused_unpressed_shade, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg",
theme->a_focused_pressed_shade, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg",
theme->a_unfocused_pressed_shade, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button-shade.disabled.bg",
theme->a_disabled_focused_shade, TRUE,
a_disabled_focused_tmp);
READ_APPEARANCE_COPY("window.inactive.button-shade.disabled.bg",
theme->a_disabled_unfocused_shade, TRUE,
a_disabled_unfocused_tmp);
/* hover */
READ_APPEARANCE_COPY("window.active.button-shade.hover.bg",
theme->a_hover_focused_shade, TRUE,
a_hover_focused_tmp);
theme->a_focused_unpressed_shade);
READ_APPEARANCE_COPY("window.inactive.button-shade.hover.bg",
theme->a_hover_unfocused_shade, TRUE,
a_hover_unfocused_tmp);
READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg",
theme->a_focused_unpressed_shade, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg",
theme->a_focused_pressed_shade, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg",
theme->a_unfocused_unpressed_shade, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg",
theme->a_unfocused_pressed_shade, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg",
theme->a_toggled_hover_focused_shade, TRUE,
a_toggled_hover_focused_tmp);
READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg",
theme->a_toggled_hover_unfocused_shade, TRUE,
a_toggled_hover_unfocused_tmp);
theme->a_unfocused_unpressed_shade);
/* toggled unpressed */
READ_APPEARANCE_COPY("window.active.button-shade.toggled.unpressed.bg",
theme->a_toggled_focused_unpressed_shade, TRUE,
a_toggled_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg",
theme->a_toggled_focused_pressed_shade, TRUE,
a_toggled_focused_pressed_tmp);
theme->a_focused_pressed_shade);
READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.unpressed.bg",
theme->a_toggled_unfocused_unpressed_shade, TRUE,
a_toggled_unfocused_unpressed_tmp);
theme->a_unfocused_pressed_shade);
/* toggled pressed */
READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg",
theme->a_toggled_focused_pressed_shade, TRUE,
theme->a_focused_pressed_shade);
READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.pressed.bg",
theme->a_toggled_unfocused_pressed_shade, TRUE,
a_toggled_unfocused_pressed_tmp);
theme->a_unfocused_pressed_shade);
/* toggled hover */
READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg",
theme->a_toggled_hover_focused_shade, TRUE,
theme->a_toggled_focused_unpressed_shade);
READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg",
theme->a_toggled_hover_unfocused_shade, TRUE,
theme->a_toggled_unfocused_unpressed_shade);
/* iconify button */
READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg",
theme->a_focused_unpressed_iconify, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg",
theme->a_unfocused_unpressed_iconify, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg",
theme->a_focused_pressed_iconify, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg",
theme->a_unfocused_pressed_iconify, TRUE,
a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button-iconify.disabled.bg",
theme->a_disabled_focused_iconify, TRUE,
a_disabled_focused_tmp);
@ -823,22 +871,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
a_disabled_unfocused_tmp);
READ_APPEARANCE_COPY("window.active.button-iconify.hover.bg",
theme->a_hover_focused_iconify, TRUE,
a_hover_focused_tmp);
theme->a_focused_unpressed_iconify);
READ_APPEARANCE_COPY("window.inactive.button-iconify.hover.bg",
theme->a_hover_unfocused_iconify, TRUE,
a_hover_unfocused_tmp);
READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg",
theme->a_focused_unpressed_iconify, TRUE,
a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg",
theme->a_focused_pressed_iconify, TRUE,
a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg",
theme->a_unfocused_unpressed_iconify, TRUE,
a_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg",
theme->a_unfocused_pressed_iconify, TRUE,
a_unfocused_pressed_tmp);
theme->a_unfocused_unpressed_iconify);
theme->a_icon->surface.grad =
theme->a_clear->surface.grad =