kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=ab2f3a97c93ca3424f870bc127b2e095964186e6
commit ab2f3a97c93ca3424f870bc127b2e095964186e6 Author: Kim Woelders <[email protected]> Date: Wed Feb 7 16:24:32 2018 +0100 Tweak new theming mmacros By Don Harrop --- config/definitions | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/config/definitions b/config/definitions index ab18ba67..7d3e53e7 100644 --- a/config/definitions +++ b/config/definitions @@ -1111,77 +1111,77 @@ __END __TCLASS __BGN; \ __NAME name -#define TEXT_NORMAL(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_NORMAL(font, effect, fgcolor, bgcolor) \ __NORMAL font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_CLICKED(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_CLICKED(font, effect, fgcolor, bgcolor) \ __CLICKED font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_HILITED(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_HILITED(font, effect, fgcolor, bgcolor) \ __HILITED font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_NORMAL_ACTIVE(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_NORMAL_ACTIVE(font, effect, fgcolor, bgcolor) \ __NORMAL_ACTIVE font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_CLICKED_ACTIVE(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_CLICKED_ACTIVE(font, effect, fgcolor, bgcolor) \ __CLICKED_ACTIVE font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_HILITED_ACTIVE(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_HILITED_ACTIVE(font, effect, fgcolor, bgcolor) \ __HILITED_ACTIVE font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_NORMAL_STICKY(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_NORMAL_STICKY(font, effect, fgcolor, bgcolor) \ __NORMAL_STICKY font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_CLICKED_STICKY(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_CLICKED_STICKY(font, effect, fgcolor, bgcolor) \ __CLICKED_STICKY font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_HILITED_STICKY(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_HILITED_STICKY(font, effect, fgcolor, bgcolor) \ __HILITED_STICKY font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_NORMAL_ACTIVE_STICKY(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_NORMAL_ACTIVE_STICKY(font, effect, fgcolor, bgcolor) \ __NORMAL_ACTIVE_STICKY font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_NORMAL_ACTIVE_CLICKED(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_NORMAL_ACTIVE_CLICKED(font, effect, fgcolor, bgcolor) \ __NORMAL_ACTIVE_CLICKED font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor -#define TEXT_NORMAL_ACTIVE_HILITED(font, effect, fr, fg, fb, br, bg, bb) \ +#define TEXT_NORMAL_ACTIVE_HILITED(font, effect, fgcolor, bgcolor) \ __NORMAL_ACTIVE_HILITED font; \ __DRAWING_EFFECT effect; \ - __FORGROUND_COLOR fr fg fb; \ - __BACKGROUND_COLOR br bg bb + __FORGROUND_COLOR fgcolor; \ + __BACKGROUND_COLOR bgcolor #define TEXT_JUSTIFY_LEFT \ __JUSTIFICATION 0 --
