Minor changes in theme.xml/style names

This commit is contained in:
David Capello 2023-02-27 18:02:10 -03:00
parent 6e2b44c72d
commit ff1211bc84
2 changed files with 7 additions and 7 deletions

View File

@ -1029,6 +1029,9 @@
<icon state="disabled" color="disabled" /> <icon state="disabled" color="disabled" />
<icon state="capture selected" color="button_selected_text" /> <icon state="capture selected" color="button_selected_text" />
</style> </style>
<style id="buttonset_item_icon_mono" extends="buttonset_item_icon">
<icon color="button_normal_text" />
</style>
<style id="buttonset_item_text" extends="buttonset_item" padding="1"> <style id="buttonset_item_text" extends="buttonset_item" padding="1">
<text color="button_normal_text" /> <text color="button_normal_text" />
<text color="button_hot_text" state="selected" /> <text color="button_hot_text" state="selected" />
@ -1074,20 +1077,17 @@
<style id="selection_mode" extends="context_bar_button" padding-top="1" /> <style id="selection_mode" extends="context_bar_button" padding-top="1" />
<style id="symmetry_field" extends="context_bar_button" padding-top="1" /> <style id="symmetry_field" extends="context_bar_button" padding-top="1" />
<style id="symmetry_options" extends="context_bar_text_button" padding-left="3" padding-bottom="3" /> <style id="symmetry_options" extends="context_bar_text_button" padding-left="3" padding-bottom="3" />
<style id="pal_edit_button_lock" extends="buttonset_item_icon" width="15"> <style id="pal_edit_lock" extends="buttonset_item_icon" width="15">
<icon part="timeline_closed_padlock_normal" /> <icon part="timeline_closed_padlock_normal" />
<icon part="timeline_closed_padlock_normal" state="capture selected" /> <icon part="timeline_closed_padlock_normal" state="capture selected" />
</style> </style>
<style id="pal_edit_button_unlock" extends="pal_edit_button_lock"> <style id="pal_edit_unlock" extends="pal_edit_lock">
<background color="edit_pal_face" /> <background color="edit_pal_face" />
<newlayer /> <newlayer />
<icon part="timeline_open_padlock_active" /> <icon part="timeline_open_padlock_active" />
</style> </style>
<style id="pal_button" extends="buttonset_item_icon" minwidth="15" padding-top="1" /> <style id="pal_button" extends="buttonset_item_icon" minwidth="15" padding-top="1" />
<style id="debugger_button" extends="buttonset_item_icon" width="17" height="19" /> <style id="debugger_button" extends="buttonset_item_icon" width="17" height="19" />
<style id="buttonset_item_icon_mono" extends="buttonset_item_icon">
<icon color="button_normal_text" />
</style>
<style id="edit_pixels_mode" 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>

View File

@ -190,8 +190,8 @@ ColorBar::ColorBar(int align, TooltipManager* tooltipManager)
item->InitTheme.connect( item->InitTheme.connect(
[this, item](){ [this, item](){
auto style = auto style =
(m_editMode ? SkinTheme::instance()->styles.palEditButtonUnlock() : (m_editMode ? SkinTheme::instance()->styles.palEditUnlock() :
SkinTheme::instance()->styles.palEditButtonLock()); SkinTheme::instance()->styles.palEditLock());
item->setStyle(style); item->setStyle(style);
}); });
m_buttons.addItem(theme->parts.palSort(), "pal_button"); m_buttons.addItem(theme->parts.palSort(), "pal_button");