From 368ac9ecb57e090c92de4b7d44138d051f657fbf Mon Sep 17 00:00:00 2001 From: rylek Date: Tue, 23 Nov 2010 11:20:00 +0000 Subject: [PATCH] .Draw: GetPaintRect added to DrawDrawing .Geom/Ctrl: different 'zoom full' icons for isotropic / anisotropic zoom mode git-svn-id: svn://ultimatepp.org/upp/trunk@2864 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Draw/Draw.h | 2 ++ uppsrc/Draw/Drawing.cpp | 5 +++++ uppsrc/Geom/Ctrl/PlotterCtrl.cpp | 1 + 3 files changed, 8 insertions(+) diff --git a/uppsrc/Draw/Draw.h b/uppsrc/Draw/Draw.h index 0d07de9e5..8fa111cb5 100644 --- a/uppsrc/Draw/Draw.h +++ b/uppsrc/Draw/Draw.h @@ -672,6 +672,8 @@ class DrawingDraw : public Draw { public: virtual dword GetInfo() const; virtual Size GetPageSize() const; + virtual Rect GetPaintRect() const; + virtual void BeginOp(); virtual void EndOp(); virtual void OffsetOp(Point p); diff --git a/uppsrc/Draw/Drawing.cpp b/uppsrc/Draw/Drawing.cpp index 8a40e36fa..38a97c18b 100644 --- a/uppsrc/Draw/Drawing.cpp +++ b/uppsrc/Draw/Drawing.cpp @@ -114,6 +114,11 @@ Size DrawingDraw::GetPageSize() const return size; } +Rect DrawingDraw::GetPaintRect() const +{ + return Rect(size); +} + void DrawingDraw::BeginOp() { DrawingOp(DRAWING_BEGIN); diff --git a/uppsrc/Geom/Ctrl/PlotterCtrl.cpp b/uppsrc/Geom/Ctrl/PlotterCtrl.cpp index f0a4f1d5d..59290691f 100644 --- a/uppsrc/Geom/Ctrl/PlotterCtrl.cpp +++ b/uppsrc/Geom/Ctrl/PlotterCtrl.cpp @@ -156,6 +156,7 @@ void PlotterCtrl::FrameLayout(Rect& rc) horz_out .Enable(sbx); horz_full.SetFrameRect(rc.right - sbx, rc.bottom, sbx, box); full .SetFrameRect(rc.right, rc.bottom, box, box); + full .SetImage(sbx ? PlotterImg::view_zoom_full_icon_old() : PlotterImg::view_zoom_full_icon()); } void PlotterCtrl::FrameAddSize(Size& sz)