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

Remove Theme::paintDesktop()

Browse Source
This commit is contained in:
David Capello 2017-02-17 14:37:58 -03:00
parent fad236ad22
commit cc20f0a21e
6 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/themes/default/theme.xml
View File

@ -29,7 +29,6 @@
<color id="selected" value="#ff5555" /> <color id="selected" value="#ff5555" />
<color id="separator_label" value="#2c4c91" /> <color id="separator_label" value="#2c4c91" />
<color id="background" value="#ffffff" /> <color id="background" value="#ffffff" />
<color id="desktop" value="#968275" />
<color id="textbox_text" value="#000000" /> <color id="textbox_text" value="#000000" />
<color id="textbox_face" value="#ffffff" /> <color id="textbox_face" value="#ffffff" />
<color id="textbox_code_face" value="#eeeeee" /> <color id="textbox_code_face" value="#eeeeee" />
@ -862,7 +861,7 @@
</style> </style>
<style id="desktop"> <style id="desktop">
<background color="desktop" /> <background color="window_face" />
</style> </style>
<style id="tooltip_window"> <style id="tooltip_window">

11
src/app/ui/skin/skin_theme.cpp
View File

@ -818,6 +818,10 @@ void SkinTheme::initWidget(Widget* widget)
widget->setChildSpacing(0); widget->setChildSpacing(0);
break; break;
case kManagerWidget:
widget->setStyle(newStyles.desktop());
break;
case kWindowWidget: case kWindowWidget:
if (TipWindow* window = dynamic_cast<TipWindow*>(widget)) { if (TipWindow* window = dynamic_cast<TipWindow*>(widget)) {
window->setStyle(newStyles.tooltipWindow()); window->setStyle(newStyles.tooltipWindow());
@ -874,13 +878,6 @@ gfx::Size SkinTheme::getEntryCaretSize(Widget* widget)
return gfx::Size(2*guiscale(), widget->textHeight()+2*guiscale()); return gfx::Size(2*guiscale(), widget->textHeight()+2*guiscale());
} }
void SkinTheme::paintDesktop(PaintEvent& ev)
{
Graphics* g = ev.graphics();
g->fillRect(colors.disabled(), g->getClipBounds());
}
void SkinTheme::paintBox(PaintEvent& ev) void SkinTheme::paintBox(PaintEvent& ev)
{ {
Widget* widget = static_cast<Widget*>(ev.getSource()); Widget* widget = static_cast<Widget*>(ev.getSource());

1
src/app/ui/skin/skin_theme.h
View File

@ -55,7 +55,6 @@ namespace app {
int getScrollbarSize() override; int getScrollbarSize() override;
gfx::Size getEntryCaretSize(ui::Widget* widget) override; gfx::Size getEntryCaretSize(ui::Widget* widget) override;
void paintDesktop(ui::PaintEvent& ev) override;
void paintBox(ui::PaintEvent& ev) override; void paintBox(ui::PaintEvent& ev) override;
void paintCheckBox(ui::PaintEvent& ev) override; void paintCheckBox(ui::PaintEvent& ev) override;
void paintEntry(ui::PaintEvent& ev) override; void paintEntry(ui::PaintEvent& ev) override;

5
src/ui/manager.cpp
View File

@ -1146,11 +1146,6 @@ void Manager::onResize(ResizeEvent& ev)
} }
} }
void Manager::onPaint(PaintEvent& ev)
{
theme()->paintDesktop(ev);
}
void Manager::onBroadcastMouseMessage(WidgetsList& targets) void Manager::onBroadcastMouseMessage(WidgetsList& targets)
{ {
// Ask to the first window in the "children" list to know how to // Ask to the first window in the "children" list to know how to

1
src/ui/manager.h
View File

@ -111,7 +111,6 @@ namespace ui {
protected: protected:
bool onProcessMessage(Message* msg) override; bool onProcessMessage(Message* msg) override;
void onResize(ResizeEvent& ev) override; void onResize(ResizeEvent& ev) override;
void onPaint(PaintEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override; void onSizeHint(SizeHintEvent& ev) override;
void onBroadcastMouseMessage(WidgetsList& targets) override; void onBroadcastMouseMessage(WidgetsList& targets) override;
virtual LayoutIO* onGetLayoutIO(); virtual LayoutIO* onGetLayoutIO();

1
src/ui/theme.h
View File

@ -53,7 +53,6 @@ namespace ui {
virtual int getScrollbarSize() = 0; virtual int getScrollbarSize() = 0;
virtual gfx::Size getEntryCaretSize(Widget* widget) = 0; virtual gfx::Size getEntryCaretSize(Widget* widget) = 0;
virtual void paintDesktop(PaintEvent& ev) = 0;
virtual void paintBox(PaintEvent& ev) = 0; virtual void paintBox(PaintEvent& ev) = 0;
virtual void paintCheckBox(PaintEvent& ev) = 0; virtual void paintCheckBox(PaintEvent& ev) = 0;
virtual void paintEntry(PaintEvent& ev) = 0; virtual void paintEntry(PaintEvent& ev) = 0;