diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2007-12-18 21:12:52 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2007-12-18 21:12:52 +0100 |
| commit | 2b8b5da04b14af1639143cc332874c7e1a03a8bb (patch) | |
| tree | 74fc76cd53dc5684b8009960e896ecbc91cf0891 /render | |
| parent | 9586ad246dae1f1de89f2070722cfa0c0c41c477 (diff) | |
| parent | 46f90bca8ab55a2f43bf33af1adf178bd0bd81d9 (diff) | |
Merge branch 'backport'
Diffstat (limited to 'render')
| -rw-r--r-- | render/font.c | 4 | ||||
| -rw-r--r-- | render/mask.c | 2 | ||||
| -rw-r--r-- | render/theme.c | 17 |
3 files changed, 4 insertions, 19 deletions
diff --git a/render/font.c b/render/font.c index 8d389d8b..356b9c6e 100644 --- a/render/font.c +++ b/render/font.c @@ -278,11 +278,11 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) c.pixel = t->color->pixel; if (t->shortcut) { - const gchar *c = t->string + t->shortcut_pos; + const gchar *s = t->string + t->shortcut_pos; t->font->shortcut_underline->start_index = t->shortcut_pos; t->font->shortcut_underline->end_index = t->shortcut_pos + - (g_utf8_next_char(c) - c); + (g_utf8_next_char(s) - s); /* the attributes are owned by the layout. re-add the attributes to the layout after changing the diff --git a/render/mask.c b/render/mask.c index 10ce8d0f..b6e3c443 100644 --- a/render/mask.c +++ b/render/mask.c @@ -47,7 +47,7 @@ void RrPixmapMaskFree(RrPixmapMask *m) void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area) { gint x, y; - if (m->mask == None) return; /* no mask given */ + if (m->mask == NULL) return; /* no mask given */ /* set the clip region */ x = area->x + (area->width - m->mask->width) / 2; diff --git a/render/theme.c b/render/theme.c index 0de3dc74..3d357e38 100644 --- a/render/theme.c +++ b/render/theme.c @@ -115,7 +115,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_menu_normal = RrAppearanceNew(inst, 0); theme->a_menu_selected = RrAppearanceNew(inst, 0); theme->a_menu_disabled = RrAppearanceNew(inst, 0); - theme->a_menu_disabled_selected = RrAppearanceNew(inst, 0); + /* a_menu_disabled_selected is copied from a_menu_selected */ theme->a_menu_text_normal = RrAppearanceNew(inst, 1); theme->a_menu_text_selected = RrAppearanceNew(inst, 1); theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); @@ -543,21 +543,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, OB_DEFAULT_ICON_HEIGHT, OB_DEFAULT_ICON_pixel_data); - /* the toggled hover mask = the toggled unpressed mask (i.e. no change) */ - theme->max_toggled_hover_mask = - RrPixmapMaskCopy(theme->max_toggled_mask); - theme->desk_toggled_hover_mask = - RrPixmapMaskCopy(theme->desk_toggled_mask); - theme->shade_toggled_hover_mask = - RrPixmapMaskCopy(theme->shade_toggled_mask); - /* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/ - theme->max_toggled_pressed_mask = - RrPixmapMaskCopy(theme->max_toggled_mask); - theme->desk_toggled_pressed_mask = - RrPixmapMaskCopy(theme->desk_toggled_mask); - theme->shade_toggled_pressed_mask = - RrPixmapMaskCopy(theme->shade_toggled_mask); - /* read the decoration textures */ if (!read_appearance(db, inst, "window.active.title.bg", theme->a_focused_title, |