mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 06:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SkiaSurface::drawRect() bounds

Browse Source
This commit is contained in:
David Capello 2015-10-02 16:24:58 -03:00
parent 7a747fc144
commit 6d1348c721
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/she/skia/skia_surface.h
View File

@ -27,8 +27,8 @@ inline SkColor to_skia(gfx::Color c) {
return SkPremultiplyARGBInline(gfx::geta(c), gfx::getr(c), gfx::getg(c), gfx::getb(c));
}
inline SkRect to_skia(const gfx::Rect& rc) {
return SkRect::Make(SkIRect::MakeXYWH(rc.x, rc.y, rc.w, rc.h));
inline SkIRect to_skia(const gfx::Rect& rc) {
return SkIRect::MakeXYWH(rc.x, rc.y, rc.w, rc.h);
}
class SkiaSurface : public NonDisposableSurface
@ -105,12 +105,12 @@ public:
void setClipBounds(const gfx::Rect& rc) override {
m_clip = rc;
m_canvas->clipRect(to_skia(m_clip), SkRegion::kReplace_Op);
m_canvas->clipRect(SkRect::Make(to_skia(m_clip)), SkRegion::kReplace_Op);
}
bool intersectClipRect(const gfx::Rect& rc) override {
m_clip &= rc;
m_canvas->clipRect(to_skia(m_clip), SkRegion::kReplace_Op);
m_canvas->clipRect(SkRect::Make(to_skia(m_clip)), SkRegion::kReplace_Op);
return !m_clip.isEmpty();
}
@ -282,7 +282,7 @@ public:
SkPaint paint;
paint.setColor(to_skia(color));
paint.setStyle(SkPaint::kStroke_Style);
m_canvas->drawRect(to_skia(rc), paint);
m_canvas->drawIRect(to_skia(gfx::Rect(rc.x, rc.y, rc.w-1, rc.h-1)), paint);
}
void fillRect(gfx::Color color, const gfx::Rect& rc) override {
@ -290,7 +290,7 @@ public:
paint.setColor(to_skia(color));
paint.setStyle(SkPaint::kFill_Style);
paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
m_canvas->drawRect(to_skia(rc), paint);
m_canvas->drawIRect(to_skia(rc), paint);
}
void blitTo(LockedSurface* dest, int srcx, int srcy, int dstx, int dsty, int width, int height) const override {