mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-06 12:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add new theme parts for ButtonSet items

Browse Source
This commit is contained in:
David Capello 2017-10-06 11:07:48 -03:00
parent 750f0c52af
commit 89c521ae15
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/extensions/aseprite-theme/theme.xml
View File

@ -190,8 +190,11 @@
<part id="toolbutton_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="toolbutton_last" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="toolbutton_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="toolbutton_hot_focused" x="128" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="toolbutton_focused" x="128" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="buttonset_item_normal" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="buttonset_item_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="buttonset_item_hot_focused" x="128" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="buttonset_item_focused" x="128" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="buttonset_item_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="tab_normal" x="2" y="112" w1="4" w2="5" w3="5" h1="4" h2="6" h3="2" />
<part id="tab_active" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
<part id="tab_bottom_active" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
@ -555,10 +558,10 @@
<icon part="radio_disabled" align="left middle" x="2" state="disabled" />
</style>
<style id="mini_button">
<background-border part="toolbutton_last" />
<background-border part="toolbutton_hot" state="mouse" />
<background-border part="toolbutton_hot" state="focus" />
<background-border part="toolbutton_pushed" state="selected" />
<background-border part="buttonset_item_normal" />
<background-border part="buttonset_item_hot" state="mouse" />
<background-border part="buttonset_item_hot" state="focus" />
<background-border part="buttonset_item_pushed" state="selected" />
<text color="button_normal_text" />
<text color="button_hot_text" state="mouse" />
<text color="button_selected_text" state="selected" />

12
src/app/ui/button_set.cpp
View File

@ -102,18 +102,18 @@ void ButtonSet::Item::onPaint(ui::PaintEvent& ev)
if (isSelected() || hasMouseOver()) {
if (hasCapture()) {
nw = theme->parts.toolbuttonPushed();
nw = theme->parts.buttonsetItemPushed();
fg = theme->colors.buttonSelectedText();
}
else {
nw = (hasFocus() ? theme->parts.toolbuttonHotFocused():
theme->parts.toolbuttonHot());
nw = (hasFocus() ? theme->parts.buttonsetItemHotFocused():
theme->parts.buttonsetItemHot());
fg = theme->colors.buttonHotText();
}
}
else {
nw = (hasFocus() ? theme->parts.toolbuttonFocused():
theme->parts.toolbuttonLast());
nw = (hasFocus() ? theme->parts.buttonsetItemFocused():
theme->parts.buttonsetItemNormal());
fg = theme->colors.buttonNormalText();
}
@ -121,7 +121,7 @@ void ButtonSet::Item::onPaint(ui::PaintEvent& ev)
rc.w += 1*guiscale();
if (!isLastRow) {
if (nw == theme->parts.toolbuttonHotFocused())
if (nw == theme->parts.buttonsetItemHotFocused())
rc.h += 2*guiscale();
else
rc.h += 3*guiscale();