Kaydet (Commit) b3464e87 authored tarafından Noel Grandin's avatar Noel Grandin

convert SymbolAlign to enum class

Change-Id: Iecc1400809212f56915cad56b739378cda49b90f
üst 93ddb2cc
...@@ -291,7 +291,7 @@ enum ImageAlign { IMAGEALIGN_LEFT, IMAGEALIGN_TOP, IMAGEALIGN_RIGHT, IMAGEALIGN_ ...@@ -291,7 +291,7 @@ enum ImageAlign { IMAGEALIGN_LEFT, IMAGEALIGN_TOP, IMAGEALIGN_RIGHT, IMAGEALIGN_
IMAGEALIGN_LEFT_TOP, IMAGEALIGN_LEFT_BOTTOM, IMAGEALIGN_TOP_LEFT, IMAGEALIGN_LEFT_TOP, IMAGEALIGN_LEFT_BOTTOM, IMAGEALIGN_TOP_LEFT,
IMAGEALIGN_TOP_RIGHT, IMAGEALIGN_RIGHT_TOP, IMAGEALIGN_RIGHT_BOTTOM, IMAGEALIGN_TOP_RIGHT, IMAGEALIGN_RIGHT_TOP, IMAGEALIGN_RIGHT_BOTTOM,
IMAGEALIGN_BOTTOM_LEFT, IMAGEALIGN_BOTTOM_RIGHT, IMAGEALIGN_CENTER }; IMAGEALIGN_BOTTOM_LEFT, IMAGEALIGN_BOTTOM_RIGHT, IMAGEALIGN_CENTER };
enum SymbolAlign { SYMBOLALIGN_LEFT, SYMBOLALIGN_RIGHT }; enum class SymbolAlign { LEFT, RIGHT };
// ButtonDialog-Types // ButtonDialog-Types
......
...@@ -79,7 +79,7 @@ public: ...@@ -79,7 +79,7 @@ public:
}; };
ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), mnButtonState(0), ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), mnButtonState(0),
mbSmallSymbol(false), maImage(), meImageAlign(IMAGEALIGN_TOP), meSymbolAlign(SYMBOLALIGN_LEFT) mbSmallSymbol(false), maImage(), meImageAlign(IMAGEALIGN_TOP), meSymbolAlign(SymbolAlign::LEFT)
{ {
} }
...@@ -463,7 +463,7 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, ...@@ -463,7 +463,7 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
if ( bHasSymbol ) if ( bHasSymbol )
{ {
if ( mpButtonData->meSymbolAlign == SYMBOLALIGN_RIGHT ) if ( mpButtonData->meSymbolAlign == SymbolAlign::RIGHT )
{ {
Point aRightPos = Point( aTextPos.X() + aTextSize.Width() + aSymbolSize.Width()/2, aTextPos.Y() ); Point aRightPos = Point( aTextPos.X() + aTextSize.Width() + aSymbolSize.Width()/2, aTextPos.Y() );
*pSymbolRect = Rectangle( aRightPos, aSymbolSize ); *pSymbolRect = Rectangle( aRightPos, aSymbolSize );
......
...@@ -47,7 +47,7 @@ void MoreButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) ...@@ -47,7 +47,7 @@ void MoreButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
ShowState(); ShowState();
SetSymbolAlign(SYMBOLALIGN_RIGHT); SetSymbolAlign(SymbolAlign::RIGHT);
SetImageAlign(IMAGEALIGN_RIGHT); //Resoves: fdo#31849 ensure button remains vertically centered SetImageAlign(IMAGEALIGN_RIGHT); //Resoves: fdo#31849 ensure button remains vertically centered
SetSmallSymbol(true); SetSmallSymbol(true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment