mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-10 19:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename blit_valid_rgn parameter to blitValidRegion

Browse Source
This commit is contained in:
David Capello 2015-07-28 14:48:19 -03:00
parent a7ea0f7ec5
commit 694b1c8da6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/ui/editor/editor.cpp
View File

@ -341,14 +341,14 @@ void Editor::setDefaultScroll()
}
// Sets the scroll position of the editor
void Editor::setEditorScroll(const gfx::Point& scroll, bool blit_valid_rgn)
void Editor::setEditorScroll(const gfx::Point& scroll, bool blitValidRegion)
{
HideBrushPreview hide(m_brushPreview);
View* view = View::getView(this);
Point oldScroll;
Region region;
if (blit_valid_rgn) {
if (blitValidRegion) {
getDrawableRegion(region, kCutTopWindows);
oldScroll = view->getViewScroll();
}
@ -356,7 +356,7 @@ void Editor::setEditorScroll(const gfx::Point& scroll, bool blit_valid_rgn)
view->setViewScroll(scroll);
Point newScroll = view->getViewScroll();
if (blit_valid_rgn) {
if (blitValidRegion) {
// Move screen with blits
scrollRegion(region, oldScroll - newScroll);
}
@ -798,7 +798,7 @@ void Editor::flashCurrentLayer()
}
}
gfx::Point Editor::autoScroll(MouseMessage* msg, AutoScroll dir, bool blit_valid_rgn)
gfx::Point Editor::autoScroll(MouseMessage* msg, AutoScroll dir, bool blitValidRegion)
{
// // Hide the brush preview
// HideBrushPreview hide(editor->brushPreview());
@ -827,7 +827,7 @@ gfx::Point Editor::autoScroll(MouseMessage* msg, AutoScroll dir, bool blit_valid
else {
scroll -= deltaScroll;
}
setEditorScroll(scroll, blit_valid_rgn);
setEditorScroll(scroll, blitValidRegion);
#if defined(_WIN32) || defined(__APPLE__)
mousePos -= delta;
@ -1408,12 +1408,12 @@ void Editor::setZoomAndCenterInMouse(Zoom zoom,
m_offset_y - (screenPos.y-vp.y) + zoom.apply(spritePos.y+zoom.remove(1)/2) + int(zoom.apply(subpixelPos.y)));
if ((m_zoom != zoom) || (screenPos != view->getViewScroll())) {
bool blit_valid_rgn = (m_zoom == zoom);
bool blitValidRegion = (m_zoom == zoom);
m_zoom = zoom;
updateEditor();
setEditorScroll(scrollPos, blit_valid_rgn);
setEditorScroll(scrollPos, blitValidRegion);
}
}

4
src/app/ui/editor/editor.h
View File

@ -124,7 +124,7 @@ namespace app {
void setOffsetY(int y) { m_offset_y = y; }
void setDefaultScroll();
void setEditorScroll(const gfx::Point& scroll, bool blit_valid_rgn);
void setEditorScroll(const gfx::Point& scroll, bool blitValidRegion);
void setEditorZoom(render::Zoom zoom);
// Updates the Editor's view.
@ -159,7 +159,7 @@ namespace app {
void updateStatusBar();
// Control scroll when cursor goes out of the editor viewport.
gfx::Point autoScroll(ui::MouseMessage* msg, AutoScroll dir, bool blit_valid_rgn);
gfx::Point autoScroll(ui::MouseMessage* msg, AutoScroll dir, bool blitValidRegion);
tools::Tool* getCurrentEditorTool();
tools::Ink* getCurrentEditorInk();