return clientBounds;
}
- FloatDimension GetItemContentSize(void) const
+ FloatDimension GetItemContentSize(bool horizontalMode, bool verticalMode) const
{
- return __pControl->GetControlDelegate().GetContentSizeF();
+ return __pControl->GetControlDelegate().GetContentSizeF(horizontalMode, verticalMode);
}
FloatDimension GetItemMinimumSize(void) const
}
FloatDimension
-_Control::GetContentSizeF(void) const
+_Control::GetContentSizeF(bool horizontalMode, bool verticalMode) const
{
ClearLastResult();
return FloatDimension(0.0f, 0.0f);
void
_Control::OnFontChanged(Tizen::Graphics::Font* pFont)
{
+ SetUpdateLayoutState(true);
}
void
}
FloatDimension
-_ControlImpl::GetContentSizeF(void) const
+_ControlImpl::GetContentSizeF(bool horizontalMode, bool verticalMode) const
{
- return GetCore().GetContentSizeF();
+ return GetCore().GetContentSizeF(horizontalMode, verticalMode);
}
HitTestResult
{
__pButtonPresenter->OnFontChanged(pFont);
+ _Control::OnFontChanged(pFont);
+
return;
}
return __bottomMargin;
}
-Tizen::Graphics::Dimension
-_Button::GetContentSize(void) const
-{
- return _CoordinateSystemUtils::ConvertToInteger(GetContentSizeInternalF());
-}
-
Tizen::Graphics::FloatDimension
-_Button::GetContentSizeF(void) const
+_Button::GetContentSizeF(bool horizontalMode, bool verticalMode) const
{
- return GetContentSizeInternalF();
+ return GetContentSizeInternalF(horizontalMode, verticalMode);
}
Tizen::Graphics::FloatDimension
-_Button::GetContentSizeInternalF(void) const
+_Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
{
for (int i = 0; i < NUMBER_OF_BUTTON_STATUS; i++)
{
return false;
}
-Tizen::Graphics::Dimension
-_ButtonImpl::GetContentSize(void) const
-{
- return GetCore().GetContentSize();
-}
-
Tizen::Graphics::FloatDimension
-_ButtonImpl::GetContentSizeF(void) const
+_ButtonImpl::GetContentSizeF(bool horizontalMode, bool verticalMode) const
{
- return GetCore().GetContentSizeF();
+ return GetCore().GetContentSizeF(horizontalMode, verticalMode);
}
_ButtonStatus
}
FloatDimension
-_Edit::GetContentSizeInternalF(void) const
+_Edit::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
{
if (!GetTextLength())
{
{
_pEditPresenter->OnFontChanged(pFont);
+ _Control::OnFontChanged(pFont);
+
return;
}
{
__pLabelPresenter->OnFontChanged(pFont);
+ _Control::OnFontChanged(pFont);
+
return;
}
return __bottomMargin;
}
-Dimension
-_Label::GetContentSize(void) const
-{
- return _CoordinateSystemUtils::ConvertToInteger(GetContentSizeInternalF());
-}
-
FloatDimension
-_Label::GetContentSizeF(void) const
+_Label::GetContentSizeF(bool horizontalMode, bool verticalMode) const
{
- return GetContentSizeInternalF();
+ return GetContentSizeInternalF(horizontalMode, verticalMode);
}
FloatDimension
-_Label::GetContentSizeInternalF(void) const
+_Label::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
{
if (__text.IsEmpty() && __pBackgroundBitmap == null)
{
return E_SUCCESS;
}
-Tizen::Graphics::Dimension
-_LabelImpl::GetContentSize(void) const
-{
- return GetCore().GetContentSize();
-}
-
Tizen::Graphics::FloatDimension
-_LabelImpl::GetContentSizeF(void) const
+_LabelImpl::GetContentSizeF(bool horizontalMode, bool verticalMode) const
{
- return GetCore().GetContentSizeF();
+ return GetCore().GetContentSizeF(horizontalMode, verticalMode);
}
result
}
FloatDimension
-_TextBoxImpl::GetContentSizeF(void) const
+_TextBoxImpl::GetContentSizeF(bool horizontalMode, bool verticalMode) const
{
- return __pEdit->GetContentSizeInternalF();
+ return __pEdit->GetContentSizeInternalF(horizontalMode, verticalMode);
}
_TextBoxImpl*
virtual void OnFontChanged(Tizen::Graphics::Font* pFont);
virtual void OnFontInfoRequested(unsigned long& style, int& size);
virtual void OnFontInfoRequested(unsigned long& style, float& size);
- virtual Tizen::Graphics::Dimension GetContentSize(void) const;
- virtual Tizen::Graphics::FloatDimension GetContentSizeF(void) const;
+ virtual Tizen::Graphics::FloatDimension GetContentSizeF(bool horizontalMode, bool verticalMode) const;
virtual void OnAncestorEnableStateChanged(const _Control& control);
public:
float GetRightTouchMarginF(void) const;
float GetBottomTouchMarginF(void) const;
- Tizen::Graphics::FloatDimension GetContentSizeInternalF(void) const;
+ Tizen::Graphics::FloatDimension GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const;
int GetTextExtentSize(void) const;
float GetTextExtentSizeF(void) const;
virtual bool OnTouchMoved(const _ControlImpl& source, const _TouchInfo& touchinfo);
virtual bool OnTouchCanceled(const _ControlImpl& source, const _TouchInfo& touchinfo);
- virtual Tizen::Graphics::Dimension GetContentSize(void) const;
- virtual Tizen::Graphics::FloatDimension GetContentSizeF(void) const;
+ virtual Tizen::Graphics::FloatDimension GetContentSizeF(bool horizontalMode, bool verticalMode) const;
public:
static const Tizen::Graphics::Color GetColorOnError(void);
virtual void OnSettingChanged(Tizen::Base::String& key);
_EditPresenter* GetPresenter(void) const;
- Tizen::Graphics::FloatDimension GetContentSizeInternalF(void) const;
+ Tizen::Graphics::FloatDimension GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const;
bool IsInternalFocused(void) const;
bool ValidatePastedText(const Tizen::Base::String& pastedText, Tizen::Base::String& replacedText);
void SetEditTextFilter(IEditTextFilter* pFilter);
virtual void OnBoundsChanged(void);
virtual void OnFontChanged(Tizen::Graphics::Font* pFont);
virtual void OnFontInfoRequested(unsigned long& style, int& size);
- virtual Tizen::Graphics::Dimension GetContentSize(void) const;
- virtual Tizen::Graphics::FloatDimension GetContentSizeF(void) const;
+ virtual Tizen::Graphics::FloatDimension GetContentSizeF(bool horizontalMode, bool verticalMode) const;
public:
result SetText(const Tizen::Base::String& text);
float GetRightMarginF(void) const;
float GetBottomMarginF(void) const;
- Tizen::Graphics::FloatDimension GetContentSizeInternalF(void) const;
+ Tizen::Graphics::FloatDimension GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const;
protected:
result SetPresenter(const _LabelPresenter& labelPresenter);
virtual result OnBoundsChanged(const Tizen::Graphics::Rectangle& oldRect, const Tizen::Graphics::Rectangle& newRect);
virtual result OnBoundsChanged(const Tizen::Graphics::FloatRectangle& oldRect, const Tizen::Graphics::FloatRectangle& newRect);
- virtual Tizen::Graphics::Dimension GetContentSize(void) const;
- virtual Tizen::Graphics::FloatDimension GetContentSizeF(void) const;
+ virtual Tizen::Graphics::FloatDimension GetContentSizeF(bool horizontalMode, bool verticalMode) const;
public:
static Tizen::Graphics::Color GetColorOnError(void);
*/
result RemoveTextBlockEventListener(Tizen::Ui::ITextBlockEventListener& listener);
- virtual Tizen::Graphics::FloatDimension GetContentSizeF(void) const;
+ virtual Tizen::Graphics::FloatDimension GetContentSizeF(bool horizontalMode, bool verticalMode) const;
// Operation
public:
// Queries
virtual Tizen::Graphics::Dimension GetContentSize(void) const = 0;
- virtual Tizen::Graphics::FloatDimension GetContentSizeF(void) const = 0;
+ virtual Tizen::Graphics::FloatDimension GetContentSizeF(bool horizontalMode, bool verticalMode) const = 0;
virtual Tizen::Ui::Animations::HitTestResult HitTest(const Tizen::Graphics::FloatPoint& point) = 0;
virtual Tizen::Base::String GetDescription(void) const = 0;
// Virtual Queries: Do not use directly. Use through delegate (GetControlDelegate())
virtual Tizen::Graphics::Dimension GetContentSize(void) const;
- virtual Tizen::Graphics::FloatDimension GetContentSizeF(void) const;
+ virtual Tizen::Graphics::FloatDimension GetContentSizeF(bool horizontalMode, bool verticalMode) const;
virtual Tizen::Ui::Animations::HitTestResult HitTest(const Tizen::Graphics::FloatPoint& point);
virtual Tizen::Base::String GetDescription(void) const;
virtual float GetVerticalScrollPosition(void) const;
// Queries
virtual Tizen::Graphics::Dimension GetContentSize(void) const;
- virtual Tizen::Graphics::FloatDimension GetContentSizeF(void) const;
+ virtual Tizen::Graphics::FloatDimension GetContentSizeF(bool horizontalMode, bool verticalMode) const;
virtual Tizen::Ui::Animations::HitTestResult HitTest(const Tizen::Graphics::FloatPoint& point);
virtual Tizen::Base::String GetDescription(void) const;
virtual result SetItemBounds(const Tizen::Graphics::FloatRectangle& rect) = 0;
virtual Tizen::Graphics::FloatRectangle GetItemBounds(void) const = 0;
virtual Tizen::Graphics::FloatRectangle GetItemClientBoundsFromSize(const Tizen::Graphics::FloatDimension& size) const = 0;
- virtual Tizen::Graphics::FloatDimension GetItemContentSize(void) const = 0;
+ virtual Tizen::Graphics::FloatDimension GetItemContentSize(bool horizontalMode, bool verticalMode) const = 0;
virtual Tizen::Graphics::FloatDimension GetItemMinimumSize(void) const = 0;
virtual Tizen::Graphics::FloatDimension GetItemMaximumSize(void) const = 0;
virtual result OnItemMeasure(float& width, float& height) = 0;
float wrapContentWidth = 0.0f;
float wrapContentHeight = 0.0f;
- if (widthMode == WRAP_CONTENT || heightMode == WRAP_CONTENT)
+ bool widthWrapContent = widthMode == WRAP_CONTENT;
+ bool heightWrapContent = heightMode == WRAP_CONTENT;
+ if (widthWrapContent || heightWrapContent)
{
- Tizen::Graphics::FloatDimension size = __pOuterControl->GetItemContentSize();
+ Tizen::Graphics::FloatDimension size = __pOuterControl->GetItemContentSize(widthWrapContent, heightWrapContent);
if (size.width > 0.0f || size.height > 0.0f)
{
__contentSizeState = true;