From 0467790bcff0e691658a3e0af6f5cba8b65ea3cb Mon Sep 17 00:00:00 2001 From: David Capello Date: Thu, 24 Jun 2010 00:09:46 -0300 Subject: [PATCH] Added skin to scrollbar. --- data/skins/default_skin/sheet.png | Bin 6834 -> 6941 bytes data/skins/default_skin/skin.xml | 2 ++ src/modules/skinneable_theme.cpp | 38 ++++++++++-------------------- src/modules/skinneable_theme.h | 21 +++++++++++++++++ 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/data/skins/default_skin/sheet.png b/data/skins/default_skin/sheet.png index 4a3fdc6aa97c2f0822554e31a13399d39611e11f..599d4638e578ecc7ba9b96b176079d5c4f99316e 100644 GIT binary patch literal 6941 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 literal 6834 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 diff --git a/data/skins/default_skin/skin.xml b/data/skins/default_skin/skin.xml index 4d96e1c47..bce14d0b3 100644 --- a/data/skins/default_skin/skin.xml +++ b/data/skins/default_skin/skin.xml @@ -107,6 +107,8 @@ + + diff --git a/src/modules/skinneable_theme.cpp b/src/modules/skinneable_theme.cpp index 8f69f7643..ea10600dc 100644 --- a/src/modules/skinneable_theme.cpp +++ b/src/modules/skinneable_theme.cpp @@ -130,6 +130,8 @@ SkinneableTheme::SkinneableTheme() sheet_mapping["colorbar_border_fg"] = PART_COLORBAR_BORDER_FG_NW; sheet_mapping["colorbar_border_bg"] = PART_COLORBAR_BORDER_BG_NW; sheet_mapping["colorbar_border_hotfg"] = PART_COLORBAR_BORDER_HOTFG_NW; + sheet_mapping["scrollbar_bg"] = PART_SCROLLBAR_BG_NW; + sheet_mapping["scrollbar_thumb"] = PART_SCROLLBAR_THUMB_NW; reload_skin(); } @@ -1324,20 +1326,19 @@ void SkinneableTheme::draw_view_scrollbar(JWidget widget, JRect clip) x2 = widget->rc->x2-1; y2 = widget->rc->y2-1; - /* border */ - rect(ji_screen, x1, y1, x2, y2, BGCOLOR); + draw_bounds_nw(ji_screen, + x1, y1, x2, y2, + PART_SCROLLBAR_BG_NW, + get_scrollbar_bg_face_color()); - /* draw the content */ - x1++, y1++, x2--, y2--; - - /* horizontal bar */ + // Horizontal bar if (widget->getAlign() & JI_HORIZONTAL) { u1 = x1+pos; v1 = y1; u2 = x1+pos+len-1; v2 = y2; } - /* vertical bar */ + // Vertical bar else { u1 = x1; v1 = y1+pos; @@ -1345,25 +1346,10 @@ void SkinneableTheme::draw_view_scrollbar(JWidget widget, JRect clip) v2 = y1+pos+len-1; } - /* background */ - jrectexclude(ji_screen, - x1, y1, x2, y2, - u1, v1, u2, v2, BGCOLOR); - - /* 1st border */ - if (jwidget_is_selected(widget)) - jrectedge(ji_screen, u1, v1, u2, v2, - COLOR_DISABLED, COLOR_BACKGROUND); - else - jrectedge(ji_screen, u1, v1, u2, v2, - COLOR_BACKGROUND, COLOR_DISABLED); - - /* bar-block background */ - u1++, v1++, u2--, v2--; - if (jwidget_is_enabled(widget) && widget->hasMouseOver()) - rectfill(ji_screen, u1, v1, u2, v2, COLOR_HOTFACE); - else - rectfill(ji_screen, u1, v1, u2, v2, BGCOLOR); + draw_bounds_nw(ji_screen, + u1, v1, u2, v2, + PART_SCROLLBAR_THUMB_NW, + get_scrollbar_thumb_face_color()); } void SkinneableTheme::draw_view_viewport(JWidget widget, JRect clip) diff --git a/src/modules/skinneable_theme.h b/src/modules/skinneable_theme.h index 81e8bd650..5720c2efd 100644 --- a/src/modules/skinneable_theme.h +++ b/src/modules/skinneable_theme.h @@ -382,6 +382,24 @@ enum { PART_COLORBAR_BORDER_HOTFG_SW, PART_COLORBAR_BORDER_HOTFG_W, + PART_SCROLLBAR_BG_NW, + PART_SCROLLBAR_BG_N, + PART_SCROLLBAR_BG_NE, + PART_SCROLLBAR_BG_E, + PART_SCROLLBAR_BG_SE, + PART_SCROLLBAR_BG_S, + PART_SCROLLBAR_BG_SW, + PART_SCROLLBAR_BG_W, + + PART_SCROLLBAR_THUMB_NW, + PART_SCROLLBAR_THUMB_N, + PART_SCROLLBAR_THUMB_NE, + PART_SCROLLBAR_THUMB_E, + PART_SCROLLBAR_THUMB_SE, + PART_SCROLLBAR_THUMB_S, + PART_SCROLLBAR_THUMB_SW, + PART_SCROLLBAR_THUMB_W, + PARTS }; @@ -483,6 +501,9 @@ public: int get_panel_face_color() const { return makecol(125, 146, 158); } + int get_scrollbar_bg_face_color() const { return makecol(125, 146, 158); } + int get_scrollbar_thumb_face_color() const { return makecol(199, 199, 199); } + BITMAP* get_part(int part_i) const { return m_part[part_i]; } BITMAP* get_toolicon(const char* tool_id) const;