mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tab style when the sprite defined color is white

Browse Source 
Now the text is painted with a negative black or white color depending
on the defined color in the sprite user data. Before this patch if the
tab was painted white (and the tab text in the theme was defined as
white) we weren't able to see the sprite name in the tab at all.
This commit is contained in:
David Capello 2021-05-24 14:36:23 -03:00
parent d164458c24
commit 73790a9dc8
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/app/ui/tabs.cpp
View File

@ -11,6 +11,7 @@
#include "app/ui/tabs.h"
#include "app/color_utils.h"
#include "app/modules/gfx.h"
#include "app/modules/gui.h"
#include "app/ui/editor/editor_view.h"
@ -600,6 +601,16 @@ void Tabs::drawTab(Graphics* g, const gfx::Rect& _box,
gfx::Rect(box.x, box.y+dy, box.w, box.h),
info);
gfx::Color tabColor = tab->color;
gfx::Color textColor = gfx::ColorNone;
if (tabColor != gfx::ColorNone) {
textColor = color_utils::blackandwhite_neg(tabColor);
if (!selected) {
tabColor = gfx::seta(tabColor, gfx::geta(tabColor)*3/4);
textColor = gfx::seta(textColor, gfx::geta(textColor)*3/4);
}
}
{
IntersectClip clip(g, gfx::Rect(box.x, box.y+dy, box.w-clipTextRightSide, box.h));
@ -626,13 +637,27 @@ void Tabs::drawTab(Graphics* g, const gfx::Rect& _box,
// Tab with text + clipping the close button
if (box.w > 8*ui::guiscale()) {
Style* stylePtr = theme->styles.tabText();
Style newStyle(nullptr);
info.text = &tab->text;
if (tab->color != gfx::ColorNone) {
g->fillRect(tab->color, gfx::Rect(box.x+dx+2, box.y+dy+3, box.w-dx-2, box.h-3));
g->fillRect(tab->color, gfx::Rect(box.x+dx+3, box.y+dy+2, box.w-dx-3, 1));
if (tabColor != gfx::ColorNone) {
// TODO replace these fillRect() with a new theme part (which
// should be painted with the specific user-defined color)
g->fillRect(tabColor, gfx::Rect(box.x+dx+2, box.y+dy+3, box.w-dx-2, box.h-3));
g->fillRect(tabColor, gfx::Rect(box.x+dx+3, box.y+dy+2, box.w-dx-3, 1));
newStyle = Style(*stylePtr);
for (auto& layer : newStyle.layers()) {
if (layer.type() == ui::Style::Layer::Type::kText ||
layer.type() == ui::Style::Layer::Type::kBackground) {
layer.setColor(textColor);
}
}
stylePtr = &newStyle;
}
theme->paintWidgetPart(
g, theme->styles.tabText(),
g, stylePtr,
gfx::Rect(box.x+dx, box.y+dy, box.w-dx, box.h),
info);
info.text = nullptr;
@ -661,9 +686,9 @@ void Tabs::drawTab(Graphics* g, const gfx::Rect& _box,
}
}
if (tab->color != gfx::ColorNone) {
g->fillRect(tab->color, gfx::Rect(closeBox.x, closeBox.y+3, closeBox.w-3, closeBox.h-3));
g->fillRect(tab->color, gfx::Rect(closeBox.x, closeBox.y+2, closeBox.w-4, 1));
if (tabColor != gfx::ColorNone) {
g->fillRect(tabColor, gfx::Rect(closeBox.x, closeBox.y+3, closeBox.w-3, closeBox.h-3));
g->fillRect(tabColor, gfx::Rect(closeBox.x, closeBox.y+2, closeBox.w-4, 1));
}
info.styleFlags = 0;