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

Move drawing code of EditorView from kPaintMessage to onPaint()

Browse Source
This commit is contained in:
David Capello 2014-04-13 15:08:24 -03:00
parent a0e403b6a6
commit b41841ddd2
2 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/app/ui/editor/editor_view.cpp
View File

@ -28,7 +28,7 @@
#include "app/ui/editor/editor.h"
#include "app/ui/skin/skin_theme.h"
#include "app/ui_context.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/resize_event.h"
#include <allegro.h>
@ -59,41 +59,32 @@ EditorView::~EditorView()
UIContext::instance()->settings()->removeObserver(this);
}
bool EditorView::onProcessMessage(Message* msg)
void EditorView::onPaint(PaintEvent& ev)
{
switch (msg->type()) {
Graphics* g = ev.getGraphics();
Widget* viewport = getViewport();
Widget* child = UI_FIRST_WIDGET(viewport->getChildren());
SkinTheme* theme = static_cast<SkinTheme*>(getTheme());
bool selected = false;
case kPaintMessage:
{
Widget* viewport = getViewport();
Widget* child = UI_FIRST_WIDGET(viewport->getChildren());
SkinTheme* theme = static_cast<SkinTheme*>(getTheme());
bool selected = false;
switch (m_type) {
switch (m_type) {
// Only show the view selected if it is the current editor
case CurrentEditorMode:
selected = (child == current_editor);
break;
// Only show the view selected if it is the current editor
case CurrentEditorMode:
selected = (child == current_editor);
break;
// Always show selected
case AlwaysSelected:
selected = true;
break;
}
theme->draw_bounds_nw(ji_screen, getBounds(),
selected ? PART_EDITOR_SELECTED_NW:
PART_EDITOR_NORMAL_NW,
ColorNone);
}
return true;
// Always show selected
case AlwaysSelected:
selected = true;
break;
}
return View::onProcessMessage(msg);
theme->draw_bounds_nw(g, getClientBounds(),
selected ? PART_EDITOR_SELECTED_NW:
PART_EDITOR_NORMAL_NW,
ColorNone);
}
void EditorView::onResize(ResizeEvent& ev)

2
src/app/ui/editor/editor_view.h
View File

@ -34,7 +34,7 @@ namespace app {
~EditorView();
protected:
bool onProcessMessage(ui::Message* msg) OVERRIDE;
void onPaint(ui::PaintEvent& ev) OVERRIDE;
void onResize(ui::ResizeEvent& ev) OVERRIDE;
// GlobalSettingsObserver impl