From d5de7d49d90a7c2b40ad685ed7a09aad5bc94b0a Mon Sep 17 00:00:00 2001 From: Flakebi Date: Tue, 27 May 2014 16:07:53 +0200 Subject: [PATCH] Add graphics for deactivated buttons --- data/skins/Ocean.stkskin | 14 ++- data/skins/Peach.stkskin | 14 ++- data/skins/ocean/glassbutton_deactivated.png | Bin 0 -> 7552 bytes .../glasscheckbox_checked_deactivated.png | Bin 0 -> 2404 bytes .../skins/ocean/glasscheckbox_deactivated.png | Bin 0 -> 2019 bytes data/skins/ocean/glassspinner_deactivated.png | Bin 0 -> 9824 bytes data/skins/peach/glassbutton_deactivated.png | Bin 0 -> 7552 bytes .../glasscheckbox_checked_deactivated.png | Bin 0 -> 2404 bytes .../skins/peach/glasscheckbox_deactivated.png | Bin 0 -> 2019 bytes data/skins/peach/glassspinner_deactivated.png | Bin 0 -> 9824 bytes src/guiengine/skin.cpp | 82 +++++++++++++----- 11 files changed, 85 insertions(+), 25 deletions(-) create mode 100644 data/skins/ocean/glassbutton_deactivated.png create mode 100644 data/skins/ocean/glasscheckbox_checked_deactivated.png create mode 100644 data/skins/ocean/glasscheckbox_deactivated.png create mode 100644 data/skins/ocean/glassspinner_deactivated.png create mode 100644 data/skins/peach/glassbutton_deactivated.png create mode 100644 data/skins/peach/glasscheckbox_checked_deactivated.png create mode 100644 data/skins/peach/glasscheckbox_deactivated.png create mode 100644 data/skins/peach/glassspinner_deactivated.png diff --git a/data/skins/Ocean.stkskin b/data/skins/Ocean.stkskin index 031c1a9b6..f3808d440 100644 --- a/data/skins/Ocean.stkskin +++ b/data/skins/Ocean.stkskin @@ -25,6 +25,8 @@ Note that checkboxes are an exception and have the following styles : "neutral+checked" "focused+unchecked" "focused+checked" + "deactivated+unchecked" + "deactivated+checked" "Advanced stretching" images are split this way : @@ -66,11 +68,15 @@ when the border that intersect at this corner are enabled. + + - @@ -131,6 +137,10 @@ when the border that intersect at this corner are enabled. left_border="110" right_border="110" top_border="0" bottom_border="36" preserve_h_aspect_ratios="true" hborder_out_portion="0.0" /> + + + + diff --git a/data/skins/Peach.stkskin b/data/skins/Peach.stkskin index 77d96e995..9848f0032 100644 --- a/data/skins/Peach.stkskin +++ b/data/skins/Peach.stkskin @@ -25,6 +25,8 @@ Note that checkboxes are an exception and have the following styles : "neutral+checked" "focused+unchecked" "focused+checked" + "deactivated+unchecked" + "deactivated+checked" "Advanced stretching" images are split this way : @@ -66,11 +68,15 @@ when the border that intersect at this corner are enabled. + + - @@ -132,6 +138,10 @@ when the border that intersect at this corner are enabled. left_border="110" right_border="110" top_border="0" bottom_border="36" preserve_h_aspect_ratios="true" hborder_out_portion="0.0" /> + + @@ -156,6 +166,8 @@ when the border that intersect at this corner are enabled. + + diff --git a/data/skins/ocean/glassbutton_deactivated.png b/data/skins/ocean/glassbutton_deactivated.png new file mode 100644 index 0000000000000000000000000000000000000000..9f292cc042814619892d8d4984301e8a99876136 GIT binary patch literal 7552 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 Byfpv- literal 0 HcmV?d00001 diff --git a/data/skins/ocean/glassspinner_deactivated.png b/data/skins/ocean/glassspinner_deactivated.png new file mode 100644 index 0000000000000000000000000000000000000000..a55cbd1e58e9d8964ecbb81177df268d661a83c8 GIT binary patch literal 9824 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 literal 0 HcmV?d00001 diff --git a/data/skins/peach/glassbutton_deactivated.png b/data/skins/peach/glassbutton_deactivated.png new file mode 100644 index 0000000000000000000000000000000000000000..9f292cc042814619892d8d4984301e8a99876136 GIT binary patch literal 7552 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 Byfpv- literal 0 HcmV?d00001 diff --git a/data/skins/peach/glassspinner_deactivated.png b/data/skins/peach/glassspinner_deactivated.png new file mode 100644 index 0000000000000000000000000000000000000000..a55cbd1e58e9d8964ecbb81177df268d661a83c8 GIT binary patch literal 9824 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 literal 0 HcmV?d00001 diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp index 6d2292573..b7cb3f4e7 100644 --- a/src/guiengine/skin.cpp +++ b/src/guiengine/skin.cpp @@ -714,7 +714,13 @@ void Skin::drawButton(Widget* w, const core::recti &rect, center.Y + (int)(((int)rect.LowerRightCorner.Y - (int)center.Y)*texture_size); - if (focused) + if (w->m_deactivated) + { + drawBoxFromStretchableTexture(w, sized_rect, + SkinConfig::m_render_params["button::deactivated"], + w->m_deactivated); + } + else if (focused) { drawBoxFromStretchableTexture(w, sized_rect, SkinConfig::m_render_params["button::focused"], @@ -725,11 +731,17 @@ void Skin::drawButton(Widget* w, const core::recti &rect, drawBoxFromStretchableTexture(w, sized_rect, SkinConfig::m_render_params["button::neutral"], w->m_deactivated); - } + } // if not deactivated or focused } else // not within an appearing dialog { - if (focused) + if (w->m_deactivated) + { + drawBoxFromStretchableTexture(w, rect, + SkinConfig::m_render_params["button::deactivated"], + w->m_deactivated); + } + else if (focused) { drawBoxFromStretchableTexture(w, rect, SkinConfig::m_render_params["button::focused"], @@ -740,7 +752,7 @@ void Skin::drawButton(Widget* w, const core::recti &rect, drawBoxFromStretchableTexture(w, rect, SkinConfig::m_render_params["button::neutral"], w->m_deactivated); - } // if not focused + } // if not deactivated or focused } // not within an appearing dialog } // drawButton @@ -818,7 +830,7 @@ void Skin::drawRatingBar(Widget *w, const core::recti &rect, const int texture_w = texture->getSize().Width / 4; const int texture_h = texture->getSize().Height; const float aspect_ratio = 1.0f; - + const int star_number = ratingBar->getStarNumber(); int star_h = rect.getHeight(); @@ -830,7 +842,7 @@ void Skin::drawRatingBar(Widget *w, const core::recti &rect, star_w = (int)(star_w * scale_factor); star_h = (int)(star_h * scale_factor); } - + // center horizontally and vertically const int x_from = rect.UpperLeftCorner.X; const int y_from = rect.UpperLeftCorner.Y; @@ -853,9 +865,9 @@ void Skin::drawRatingBar(Widget *w, const core::recti &rect, star_rect.UpperLeftCorner.Y = y_from; star_rect.LowerRightCorner.X = x_from + (i + 1) * star_w; star_rect.LowerRightCorner.Y = y_from + star_h; - + int step = ratingBar->getStepsOfStar(i); - + const core::recti source_area(texture_w * step, 0, texture_w * (step + 1), texture_h); @@ -1236,7 +1248,11 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget, else if(player_id==3) params=&SkinConfig::m_render_params["spinner4::neutral"]; } - else if (focused|| pressed) + else if (widget->m_deactivated) + { + params=&SkinConfig::m_render_params["spinner::deactivated"]; + } + else if (focused || pressed) { params=&SkinConfig::m_render_params["spinner::focused"]; } @@ -1253,7 +1269,7 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget, rect2.LowerRightCorner.Y += 5; drawBoxFromStretchableTexture(widget, rect2, SkinConfig::m_render_params["squareFocusHalo::neutral"]); - + } else if (widget->isFocusedForPlayer(1)) @@ -1314,7 +1330,7 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget, // ---- If this spinner is of "gauge" type, draw filling const SpinnerWidget* w = dynamic_cast(widget); - + if (w->isGauge() && !w->m_deactivated) { const int handle_size = (int)( widget->m_h*params->m_left_border @@ -1361,7 +1377,7 @@ void Skin::drawSpinnerChild(const core::recti &rect, Widget* widget, { if (!widget->isVisible()) return; - if (pressed) + if (!widget->m_deactivated && pressed) { Widget* spinner = widget->m_event_handler; int areas = 0; @@ -1516,19 +1532,39 @@ void Skin::drawCheckBox(const core::recti &rect, Widget* widget, bool focused) if (w->getState() == true) { - texture = focused - ? SkinConfig::m_render_params["checkbox::focused+checked"] - .getImage() - : SkinConfig::m_render_params["checkbox::neutral+checked"] - .getImage(); + if (w->m_deactivated) + { + texture = SkinConfig::m_render_params["checkbox::deactivated+checked"] + .getImage(); + } + else if(focused) + { + texture = SkinConfig::m_render_params["checkbox::focused+checked"] + .getImage(); + } + else + { + texture = SkinConfig::m_render_params["checkbox::neutral+checked"] + .getImage(); + } } else { - texture = focused - ? SkinConfig::m_render_params["checkbox::focused+unchecked"] - .getImage() - : SkinConfig::m_render_params["checkbox::neutral+unchecked"] - .getImage(); + if (w->m_deactivated) + { + texture = SkinConfig::m_render_params["checkbox::deactivated+unchecked"] + .getImage(); + } + else if(focused) + { + texture = SkinConfig::m_render_params["checkbox::focused+unchecked"] + .getImage(); + } + else + { + texture = SkinConfig::m_render_params["checkbox::neutral+unchecked"] + .getImage(); + } } const int texture_w = texture->getSize().Width; @@ -1651,7 +1687,7 @@ void Skin::renderSections(PtrVector* within_vector) drawBoxFromStretchableTexture(&widget, rect, SkinConfig::m_render_params["section::neutral"]); } - + renderSections( &widget.m_children ); } else if (widget.isBottomBar())