mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-06 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show the Tiles button highlighted ("button_selected_text") when it's in tiles mode

Browse Source 
It was planned to use this color for this button when it's on.
This commit is contained in:
David Capello 2023-02-27 16:54:22 -03:00
parent 5ea89141fd
commit 0491bf60d7
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1088,15 +1088,13 @@
<style id="buttonset_item_icon_mono" extends="buttonset_item_icon"> <style id="buttonset_item_icon_mono" extends="buttonset_item_icon">
<icon color="button_normal_text" /> <icon color="button_normal_text" />
</style> </style>
<style id="tiles_button" extends="buttonset_item_icon" width="15"> <style id="edit_pixels_mode" extends="buttonset_item_icon" width="15">
<icon color="button_normal_text" /> <icon color="button_normal_text" />
</style> </style>
<style id="tiles_button_hot" extends="buttonset_item" width="15"> <style id="edit_tiles_mode" extends="edit_pixels_mode" width="15">
<background color="edit_pal_face" /> <background color="edit_pal_face" />
<newlayer /> <newlayer />
<icon color="button_normal_text" /> <icon color="button_selected_text" />
<icon state="disabled" color="disabled" />
<icon state="capture selected" color="button_selected_text" />
</style> </style>
<style id="standard_brush" extends="buttonset_item_icon_mono" width="17" height="19" /> <style id="standard_brush" extends="buttonset_item_icon_mono" width="17" height="19" />
<style id="outline_cell" extends="buttonset_item_icon" width="17" height="19" /> <style id="outline_cell" extends="buttonset_item_icon" width="17" height="19" />

9
src/app/ui/color_bar.cpp
View File

@ -200,12 +200,11 @@ ColorBar::ColorBar(int align, TooltipManager* tooltipManager)
item = m_tilesButton.addItem(theme->parts.tiles()); item = m_tilesButton.addItem(theme->parts.tiles());
item->InitTheme.connect( item->InitTheme.connect(
[this, item]() { [this, item]() {
auto theme = SkinTheme::instance();
const bool canEditTiles = this->canEditTiles(); const bool editTiles = (canEditTiles() &&
const bool editTiles = (canEditTiles &&
m_tilemapMode == TilemapMode::Tiles); m_tilemapMode == TilemapMode::Tiles);
auto style = editTiles ? SkinTheme::instance()->styles.tilesButtonHot() : auto style = (editTiles ? theme->styles.editTilesMode() :
SkinTheme::instance()->styles.tilesButton(); theme->styles.editPixelsMode());
item->setStyle(style); item->setStyle(style);
}); });