From 21a43bad983b57d6b41de92ec0aa861938398c7f Mon Sep 17 00:00:00 2001 From: "jaewon7.cho" Date: Thu, 28 Mar 2013 10:16:14 +0900 Subject: [PATCH] Update _Control/_ControlImpl::OnCanvasRequestedFN() function Change-Id: Ice6700d225a3315d47df9674e1d5284fa41133af Signed-off-by: jaewon7.cho --- src/ui/FUi_Control.cpp | 6 +++--- src/ui/FUi_ControlImpl.cpp | 4 ++-- src/ui/inc/FUi_Control.h | 4 ++-- src/ui/inc/FUi_ControlImpl.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 src/ui/FUi_Control.cpp mode change 100644 => 100755 src/ui/inc/FUi_Control.h diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp old mode 100644 new mode 100755 index e6f99cf..217465a --- a/src/ui/FUi_Control.cpp +++ b/src/ui/FUi_Control.cpp @@ -744,7 +744,7 @@ _Control::OnCanvasRequestedN(const Dimension& size) } Canvas* -_Control::OnCanvasRequestedFN(const FloatDimension& size) +_Control::OnCanvasRequestedFN(const FloatRectangle& bounds) { return null; @@ -2107,7 +2107,7 @@ Canvas* _Control::GetCanvasN(const Rectangle& bounds) const { ClearLastResult(); - Canvas *pCanvas = GetControlDelegate().OnCanvasRequestedN(Dimension(bounds.width, bounds.height)); + Canvas *pCanvas = GetControlDelegate().OnCanvasRequestedFN(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height)); if (pCanvas == null) { GetVisualElement()->SetFlushNeeded(); @@ -2131,7 +2131,7 @@ Canvas* _Control::GetCanvasN(const FloatRectangle& bounds) const { ClearLastResult(); - Canvas *pCanvas = GetControlDelegate().OnCanvasRequestedFN(FloatDimension(bounds.width, bounds.height)); + Canvas *pCanvas = GetControlDelegate().OnCanvasRequestedFN(FloatRectangle(bounds)); if (pCanvas == null) { GetVisualElement()->SetFlushNeeded(); diff --git a/src/ui/FUi_ControlImpl.cpp b/src/ui/FUi_ControlImpl.cpp index b9dc937..555c213 100755 --- a/src/ui/FUi_ControlImpl.cpp +++ b/src/ui/FUi_ControlImpl.cpp @@ -2384,9 +2384,9 @@ _ControlImpl::OnCanvasRequestedN(const Tizen::Graphics::Dimension& size) } Tizen::Graphics::Canvas* -_ControlImpl::OnCanvasRequestedFN(const Tizen::Graphics::FloatDimension& size) +_ControlImpl::OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& bounds) { - return GetCore().OnCanvasRequestedFN(size); + return GetCore().OnCanvasRequestedFN(bounds); } Tizen::Graphics::Bitmap* diff --git a/src/ui/inc/FUi_Control.h b/src/ui/inc/FUi_Control.h old mode 100644 new mode 100755 index 95a5ebd..db7b1ed --- a/src/ui/inc/FUi_Control.h +++ b/src/ui/inc/FUi_Control.h @@ -81,7 +81,7 @@ public: // Invoked by operations virtual void OnDraw(void) = 0; virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::Dimension& size) = 0; - virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatDimension& size) = 0; + virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& bounds) = 0; virtual Tizen::Graphics::Bitmap* OnCapturedBitmapRequestedN(void) = 0; virtual result OnAttaching(const _Control* pParent) = 0; virtual result OnAttached(void) = 0; @@ -225,7 +225,7 @@ public: // Callbacks // [ToDo] Make these callbacks protected. virtual void OnDraw(void); virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::Dimension& size); - virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatDimension& size); + virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& bounds); virtual Tizen::Graphics::Bitmap* OnCapturedBitmapRequestedN(void); virtual result OnAttaching(const _Control* pParent); virtual result OnAttached(void); diff --git a/src/ui/inc/FUi_ControlImpl.h b/src/ui/inc/FUi_ControlImpl.h index 9ce5432..fe91294 100755 --- a/src/ui/inc/FUi_ControlImpl.h +++ b/src/ui/inc/FUi_ControlImpl.h @@ -132,7 +132,7 @@ public: // Callbacks virtual void OnDraw(void); virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::Dimension& size); - virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatDimension& size); + virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& size); virtual Tizen::Graphics::Bitmap* OnCapturedBitmapRequestedN(void); virtual result OnAttaching(const _Control* pParent); virtual void OnAttachingFailed(const _Control& parent); -- 2.7.4