nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename osx to mirrorhorizontal and split to splitvertical, this will make all themes that used them not look right so update them

Browse source
This commit is contained in:
Mikael Magnusson 2006-08-24 17:57:01 +00:00
parent d9f14c1d01
commit 766e7ae9bf
6 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG
View file

@ -4,8 +4,9 @@
* Fix incorrect handling of window properties on 64 bit arches. * Fix incorrect handling of window properties on 64 bit arches.
* Fix pixelsize being the same as size for pango, now it is correct. * Fix pixelsize being the same as size for pango, now it is correct.
* Fix drawing of icons taller than wide, eg gimp. * Fix drawing of icons taller than wide, eg gimp.
* Add a 'osx' gradient, like horizontal but mirrored in the center and * Add a 'mirrorhorizontal' gradient, like horizontal but mirrored in the
'split' which is like vertical but nonlinear in a fancy way. center and 'splitvertical' which is like vertical but nonlinear in a fancy
way.
* Translations for de, hr and zh_TW added. * Translations for de, hr and zh_TW added.
* Add initial per-app settings support. * Add initial per-app settings support.
* Fix some outstanding issues with 64-bit support. * Fix some outstanding issues with 64-bit support.

16
render/gradient.c
View file

@ -25,10 +25,10 @@
static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised); static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
static void gradient_solid(RrAppearance *l, gint w, gint h); static void gradient_solid(RrAppearance *l, gint w, gint h);
static void gradient_split(RrAppearance *a, gint w, gint h); static void gradient_splitvertical(RrAppearance *a, gint w, gint h);
static void gradient_vertical(RrSurface *sf, gint w, gint h); static void gradient_vertical(RrSurface *sf, gint w, gint h);
static void gradient_horizontal(RrSurface *sf, gint w, gint h); static void gradient_horizontal(RrSurface *sf, gint w, gint h);
static void gradient_osx(RrSurface *sf, gint w, gint h); static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h);
static void gradient_diagonal(RrSurface *sf, gint w, gint h); static void gradient_diagonal(RrSurface *sf, gint w, gint h);
static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h); static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h);
static void gradient_pyramid(RrSurface *sf, gint inw, gint inh); static void gradient_pyramid(RrSurface *sf, gint inw, gint inh);
@ -44,8 +44,8 @@ void RrRender(RrAppearance *a, gint w, gint h)
case RR_SURFACE_SOLID: case RR_SURFACE_SOLID:
gradient_solid(a, w, h); gradient_solid(a, w, h);
break; break;
case RR_SURFACE_SPLIT: case RR_SURFACE_SPLIT_VERTICAL:
gradient_split(a, w, h); gradient_splitvertical(a, w, h);
break; break;
case RR_SURFACE_VERTICAL: case RR_SURFACE_VERTICAL:
gradient_vertical(&a->surface, w, h); gradient_vertical(&a->surface, w, h);
@ -53,8 +53,8 @@ void RrRender(RrAppearance *a, gint w, gint h)
case RR_SURFACE_HORIZONTAL: case RR_SURFACE_HORIZONTAL:
gradient_horizontal(&a->surface, w, h); gradient_horizontal(&a->surface, w, h);
break; break;
case RR_SURFACE_OSX: case RR_SURFACE_MIRROR_HORIZONTAL:
gradient_osx(&a->surface, w, h); gradient_mirrorhorizontal(&a->surface, w, h);
break; break;
case RR_SURFACE_DIAGONAL: case RR_SURFACE_DIAGONAL:
gradient_diagonal(&a->surface, w, h); gradient_diagonal(&a->surface, w, h);
@ -363,7 +363,7 @@ static void gradient_solid(RrAppearance *l, gint w, gint h)
} \ } \
} }
static void gradient_split(RrAppearance *a, gint w, gint h) static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
{ {
gint x, y1, y3, r, g, b; gint x, y1, y3, r, g, b;
RrSurface *sf = &a->surface; RrSurface *sf = &a->surface;
@ -449,7 +449,7 @@ static void gradient_horizontal(RrSurface *sf, gint w, gint h)
*(data + y * w) = current; *(data + y * w) = current;
} }
static void gradient_osx(RrSurface *sf, gint w, gint h) static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h)
{ {
gint x, y; gint x, y;
RrPixel32 *data = sf->pixel_data, *datav; RrPixel32 *data = sf->pixel_data, *datav;

4
render/render.h
View file

@ -62,13 +62,13 @@ typedef enum {
RR_SURFACE_NONE, RR_SURFACE_NONE,
RR_SURFACE_PARENTREL, RR_SURFACE_PARENTREL,
RR_SURFACE_SOLID, RR_SURFACE_SOLID,
RR_SURFACE_SPLIT, RR_SURFACE_SPLIT_VERTICAL,
RR_SURFACE_HORIZONTAL, RR_SURFACE_HORIZONTAL,
RR_SURFACE_VERTICAL, RR_SURFACE_VERTICAL,
RR_SURFACE_DIAGONAL, RR_SURFACE_DIAGONAL,
RR_SURFACE_CROSS_DIAGONAL, RR_SURFACE_CROSS_DIAGONAL,
RR_SURFACE_PYRAMID, RR_SURFACE_PYRAMID,
RR_SURFACE_OSX RR_SURFACE_MIRROR_HORIZONTAL,
} RrSurfaceColorType; } RrSurfaceColorType;
typedef enum { typedef enum {

8
render/theme.c
View file

@ -1197,14 +1197,14 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad,
*grad = RR_SURFACE_CROSS_DIAGONAL; *grad = RR_SURFACE_CROSS_DIAGONAL;
else if (strstr(tex, "pyramid") != NULL) else if (strstr(tex, "pyramid") != NULL)
*grad = RR_SURFACE_PYRAMID; *grad = RR_SURFACE_PYRAMID;
else if (strstr(tex, "osx") != NULL) else if (strstr(tex, "mirrorhorizontal") != NULL)
*grad = RR_SURFACE_OSX; *grad = RR_SURFACE_MIRROR_HORIZONTAL;
else if (strstr(tex, "horizontal") != NULL) else if (strstr(tex, "horizontal") != NULL)
*grad = RR_SURFACE_HORIZONTAL; *grad = RR_SURFACE_HORIZONTAL;
else if (strstr(tex, "vertical") != NULL) else if (strstr(tex, "vertical") != NULL)
*grad = RR_SURFACE_VERTICAL; *grad = RR_SURFACE_VERTICAL;
else if (strstr(tex, "split") != NULL) else if (strstr(tex, "splitvertical") != NULL)
*grad = RR_SURFACE_SPLIT; *grad = RR_SURFACE_SPLIT_VERTICAL;
else else
*grad = RR_SURFACE_DIAGONAL; *grad = RR_SURFACE_DIAGONAL;
} else { } else {

6
themes/Natura/openbox-3/themerc
View file

@ -14,7 +14,7 @@ window.*.client.color: #eeeeee
*.text.justify: left *.text.justify: left
!! Menu !! Menu
menu.title.bg: flat gradient split menu.title.bg: flat gradient splitvertical
menu.title.bg.color: #5c4e45 menu.title.bg.color: #5c4e45
menu.title.bg.colorTo: #51443e menu.title.bg.colorTo: #51443e
menu.title.text.color: #ffffff menu.title.text.color: #ffffff
@ -25,13 +25,13 @@ menu.items.bg.color: #f9f2ee
menu.items.text.color: #000000 menu.items.text.color: #000000
menu.items.disabled.text.color: #737573 menu.items.disabled.text.color: #737573
menu.items.active.bg: flat gradient split menu.items.active.bg: flat gradient splitvertical
menu.items.active.bg.color: #5c4e45 menu.items.active.bg.color: #5c4e45
menu.items.active.bg.colorTo:#51443e menu.items.active.bg.colorTo:#51443e
menu.items.active.text.color: #f9f2ee menu.items.active.text.color: #f9f2ee
!! Active Windows !! Active Windows
window.active.title.bg: flat gradient split window.active.title.bg: flat gradient splitvertical
window.active.title.bg.color: #5c4e45 window.active.title.bg.color: #5c4e45
window.active.title.bg.colorTo: #51443e window.active.title.bg.colorTo: #51443e
window.active.*.bg.border.color: #000000 window.active.*.bg.border.color: #000000

4
themes/bear2/openbox-3/themerc
View file

@ -40,7 +40,7 @@ menu.items.active.bg.border.color: #416c98
!!Active !!Active
window.active.title.bg: flat border gradient osx window.active.title.bg: flat border gradient mirrorhorizontal
window.active.title.bg.color: #3465A4 window.active.title.bg.color: #3465A4
window.active.title.bg.colorTo: #407CCA window.active.title.bg.colorTo: #407CCA
window.active.title.bg.border.color: #699acd window.active.title.bg.border.color: #699acd
@ -61,7 +61,7 @@ window.*.grip.bg: parentrelative
!!Inactive !!Inactive
window.inactive.title.bg: flat border gradient osx window.inactive.title.bg: flat border gradient mirrorhorizontal
window.inactive.title.bg.color: #dcdcdc window.inactive.title.bg.color: #dcdcdc
window.inactive.title.bg.colorTo: #eeeeec window.inactive.title.bg.colorTo: #eeeeec
window.inactive.title.bg.border.color: #efefef window.inactive.title.bg.border.color: #efefef