Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 03:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make bgcolor tint button background images (#9818)

Browse Source
This commit is contained in:
Hugues Ross 2020-08-29 11:41:19 -04:00 committed by GitHub
parent 3693b6871e
commit 9976f36b18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/devtest/mods/testformspec/formspec.lua
View File

@ -164,7 +164,7 @@ local style_fs = [[
style[one_btn14:hovered+pressed;textcolor=purple] style[one_btn14:hovered+pressed;textcolor=purple]
image_button[0,9.6;1,1;testformspec_button_image.png;one_btn14;Bg] image_button[0,9.6;1,1;testformspec_button_image.png;one_btn14;Bg]
style[one_btn15;border=false;bgimg=testformspec_bg.png;bgimg_hovered=testformspec_bg_hovered.png;bgimg_pressed=testformspec_bg_pressed.png] style[one_btn15;border=false;bgcolor=#1cc;bgimg=testformspec_bg.png;bgimg_hovered=testformspec_bg_hovered.png;bgimg_pressed=testformspec_bg_pressed.png]
item_image_button[1.25,9.6;1,1;testformspec:item;one_btn15;Bg] item_image_button[1.25,9.6;1,1;testformspec:item;one_btn15;Bg]
style[one_btn16;border=false;bgimg=testformspec_bg_9slice.png;bgimg_hovered=testformspec_bg_9slice_hovered.png;bgimg_pressed=testformspec_bg_9slice_pressed.png;bgimg_middle=4,6] style[one_btn16;border=false;bgimg=testformspec_bg_9slice.png;bgimg_hovered=testformspec_bg_9slice_hovered.png;bgimg_pressed=testformspec_bg_9slice_pressed.png;bgimg_middle=4,6]

5
src/client/guiscalingfilter.cpp
View File

@ -172,11 +172,8 @@ void draw2DImageFilterScaled(video::IVideoDriver *driver, video::ITexture *txr,
void draw2DImage9Slice(video::IVideoDriver *driver, video::ITexture *texture, void draw2DImage9Slice(video::IVideoDriver *driver, video::ITexture *texture,
const core::rect<s32> &rect, const core::rect<s32> &middle, const core::rect<s32> &rect, const core::rect<s32> &middle,
const core::rect<s32> *cliprect) const core::rect<s32> *cliprect, const video::SColor *const colors)
{ {
const video::SColor color(255,255,255,255);
const video::SColor colors[] = {color,color,color,color};
auto originalSize = texture->getOriginalSize(); auto originalSize = texture->getOriginalSize();
core::vector2di lowerRightOffset = core::vector2di(originalSize.Width, originalSize.Height) - middle.LowerRightCorner; core::vector2di lowerRightOffset = core::vector2di(originalSize.Width, originalSize.Height) - middle.LowerRightCorner;

3
src/client/guiscalingfilter.h
View File

@ -54,4 +54,5 @@ void draw2DImageFilterScaled(video::IVideoDriver *driver, video::ITexture *txr,
*/ */
void draw2DImage9Slice(video::IVideoDriver *driver, video::ITexture *texture, void draw2DImage9Slice(video::IVideoDriver *driver, video::ITexture *texture,
const core::rect<s32> &rect, const core::rect<s32> &middle, const core::rect<s32> &rect, const core::rect<s32> &middle,
const core::rect<s32> *cliprect = nullptr); const core::rect<s32> *cliprect = nullptr,
const video::SColor *const colors = nullptr);

21
src/gui/guiButton.cpp
View File

@ -313,11 +313,12 @@ void GUIButton::draw()
// PATCH // PATCH
video::ITexture* texture = ButtonImages[(u32)imageState].Texture; video::ITexture* texture = ButtonImages[(u32)imageState].Texture;
video::SColor image_colors[] = { BgColor, BgColor, BgColor, BgColor };
if (BgMiddle.getArea() == 0) { if (BgMiddle.getArea() == 0) {
driver->draw2DImage(texture, driver->draw2DImage(texture,
ScaleImage? AbsoluteRect : core::rect<s32>(pos, sourceRect.getSize()), ScaleImage? AbsoluteRect : core::rect<s32>(pos, sourceRect.getSize()),
sourceRect, &AbsoluteClippingRect, sourceRect, &AbsoluteClippingRect,
0, UseAlphaChannel); image_colors, UseAlphaChannel);
} else { } else {
core::rect<s32> middle = BgMiddle; core::rect<s32> middle = BgMiddle;
// `-x` is interpreted as `w - x` // `-x` is interpreted as `w - x`
@ -327,7 +328,7 @@ void GUIButton::draw()
middle.LowerRightCorner.Y += texture->getOriginalSize().Height; middle.LowerRightCorner.Y += texture->getOriginalSize().Height;
draw2DImage9Slice(driver, texture, draw2DImage9Slice(driver, texture,
ScaleImage ? AbsoluteRect : core::rect<s32>(pos, sourceRect.getSize()), ScaleImage ? AbsoluteRect : core::rect<s32>(pos, sourceRect.getSize()),
middle, &AbsoluteClippingRect); middle, &AbsoluteClippingRect, image_colors);
} }
// END PATCH // END PATCH
} }
@ -722,6 +723,8 @@ GUIButton* GUIButton::addButton(IGUIEnvironment *environment,
void GUIButton::setColor(video::SColor color) void GUIButton::setColor(video::SColor color)
{ {
BgColor = color;
float d = 0.65f; float d = 0.65f;
for (size_t i = 0; i < 4; i++) { for (size_t i = 0; i < 4; i++) {
video::SColor base = Environment->getSkin()->getColor((gui::EGUI_DEFAULT_COLOR)i); video::SColor base = Environment->getSkin()->getColor((gui::EGUI_DEFAULT_COLOR)i);
@ -750,22 +753,26 @@ void GUIButton::setFromStyle(const StyleSpec& style)
bool pressed = (style.getState() & StyleSpec::STATE_PRESSED) != 0; bool pressed = (style.getState() & StyleSpec::STATE_PRESSED) != 0;
if (style.isNotDefault(StyleSpec::BGCOLOR)) { if (style.isNotDefault(StyleSpec::BGCOLOR)) {
setColor(style.getColor(StyleSpec::BGCOLOR)); setColor(style.getColor(StyleSpec::BGCOLOR));
// If we have a propagated hover/press color, we need to automatically // If we have a propagated hover/press color, we need to automatically
// lighten/darken it // lighten/darken it
if (!Styles[style.getState()].isNotDefault(StyleSpec::BGCOLOR)) { if (!Styles[style.getState()].isNotDefault(StyleSpec::BGCOLOR)) {
for (size_t i = 0; i < 4; i++) {
if (pressed) { if (pressed) {
Colors[i] = multiplyColorValue(Colors[i], COLOR_PRESSED_MOD); BgColor = multiplyColorValue(BgColor, COLOR_PRESSED_MOD);
for (size_t i = 0; i < 4; i++)
Colors[i] = multiplyColorValue(Colors[i], COLOR_PRESSED_MOD);
} else if (hovered) { } else if (hovered) {
Colors[i] = multiplyColorValue(Colors[i], COLOR_HOVERED_MOD); BgColor = multiplyColorValue(BgColor, COLOR_HOVERED_MOD);
for (size_t i = 0; i < 4; i++)
Colors[i] = multiplyColorValue(Colors[i], COLOR_HOVERED_MOD);
} }
}
} }
} else { } else {
BgColor = video::SColor(255, 255, 255, 255);
for (size_t i = 0; i < 4; i++) { for (size_t i = 0; i < 4; i++) {
video::SColor base = video::SColor base =
Environment->getSkin()->getColor((gui::EGUI_DEFAULT_COLOR)i); Environment->getSkin()->getColor((gui::EGUI_DEFAULT_COLOR)i);

1
src/gui/guiButton.h
View File

@ -338,5 +338,6 @@ private:
core::rect<s32> BgMiddle; core::rect<s32> BgMiddle;
core::rect<s32> Padding; core::rect<s32> Padding;
core::vector2d<s32> ContentOffset; core::vector2d<s32> ContentOffset;
video::SColor BgColor;
// END PATCH // END PATCH
}; };