mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor glitch with Eraser brush preview when Timeline is switched with Tab key

Browse Source
This commit is contained in:
David Capello 2015-07-06 12:05:24 -03:00
parent e0ad704af1
commit 803d9e7a17
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/ui/editor/brush_preview.cpp
View File

@ -93,6 +93,10 @@ void BrushPreview::show(const gfx::Point& screenPos)
// Get drawable region
m_editor->getDrawableRegion(m_clippingRegion, ui::Widget::kCutTopWindows);
// Remove the invalidated region in the editor.
m_clippingRegion.createSubtraction(m_clippingRegion,
m_editor->getUpdateRegion());
// Get cursor color
app::Color app_cursor_color = Preferences::instance().editor.cursorColor();
gfx::Color ui_cursor_color = color_utils::color_for_ui(app_cursor_color);
@ -219,16 +223,19 @@ void BrushPreview::hide()
Sprite* sprite = m_editor->sprite();
ASSERT(sprite);
// Get drawable region
m_editor->getDrawableRegion(m_clippingRegion, ui::Widget::kCutTopWindows);
gfx::Point pos = m_editorPosition;
// Remove the invalidated region in the editor.
m_clippingRegion.createSubtraction(m_clippingRegion,
m_editor->getUpdateRegion());
{
// Restore pixels
ui::ScreenGraphics g;
ui::SetClip clip(&g, gfx::Rect(0, 0, g.width(), g.height()));
forEachBrushPixel(&g, m_screenPosition, pos, gfx::ColorNone,
forEachBrushPixel(&g, m_screenPosition, m_editorPosition, gfx::ColorNone,
&BrushPreview::clearPixelDelegate);
}
@ -317,7 +324,7 @@ void BrushPreview::forEachBrushPixel(
if (m_type & BRUSH_BOUNDARIES)
traceBrushBoundaries(g, spritePos, color, pixelDelegate);
// Depending on the editor zoom, maybe wee need subpixel movement (a
// Depending on the editor zoom, maybe we need subpixel movement (a
// little dot inside the active pixel)
if (m_editor->zoom().scale() >= 4.0)
(this->*pixelDelegate)(g, screenPos, color);

6
src/ui/widget.h
View File

@ -298,6 +298,12 @@ namespace ui {
void invalidateRect(const gfx::Rect& rect);
void invalidateRegion(const gfx::Region& region);
// Returns the invalid region to being updated with PaintMessages
// and onPaint() events.
const gfx::Region& getUpdateRegion() const {
return m_updateRegion;
}
void flushRedraw();
void scrollRegion(const gfx::Region& region, const gfx::Point& delta);