Skip to content

C
core
Kaydet (Commit) 670b7ade authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert BUTTON_DRAW constants to scoped enum 

Change-Id: I6ad6558c855736a4a5268593ced9c8300235d4bd
üst d61f0a8c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 118 deletions
cui/source/customize/cfg.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -4587,13 +4587,13 @@ void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat
pVDev->SetOutputSizePixel( aSize );
Image aImage = GetSizedImage( *pVDev.get(), aSize,
CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT ));
CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default ));
// Fill button data struct with new images
pData->SetImage(SvBmp::UNCHECKED, aImage);
pData->SetImage(SvBmp::CHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED )) );
pData->SetImage(SvBmp::HICHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED )) );
pData->SetImage(SvBmp::HIUNCHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED)) );
pData->SetImage(SvBmp::CHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked )) );
pData->SetImage(SvBmp::HICHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked | DrawButtonFlags::Pressed )) );
pData->SetImage(SvBmp::HIUNCHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default | DrawButtonFlags::Pressed)) );
pData->SetImage(SvBmp::TRISTATE, GetSizedImage( *pVDev.get(), aSize, Image() ) ); // Use tristate bitmaps to have no checkbox for separator entries
pData->SetImage(SvBmp::HITRISTATE, GetSizedImage( *pVDev.get(), aSize, Image() ) );
......
cui/source/dialogs/hangulhanjadlg.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -27,6 +27,7 @@
#include <vcl/controllayout.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/decoview.hxx>
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
#include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
......@@ -241,7 +242,7 @@ namespace svx
// calculate the size of the radio image - we're to paint our text _after_ this image
DBG_ASSERT( !GetModeRadioImage(), "RubyRadioButton::Paint: images not supported!" );
Size aImageSize = GetRadioImage( GetSettings(), 0 ).GetSizePixel();
Size aImageSize = GetRadioImage( GetSettings(), DrawButtonFlags::NONE ).GetSizePixel();
aImageSize.Width() = CalcZoom( aImageSize.Width() ) + 2; // + 2 because otherwise the radiobuttons
aImageSize.Height() = CalcZoom( aImageSize.Height() ) + 2; // appear a bit cut from right and top.
......
cui/source/options/optdict.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -362,7 +362,7 @@ void SvxEditDictionaryDialog::Paint( const Rectangle& rRect )
//Rectangle aRect(aEditDictsBox.GetPosPixel(),aEditDictsBox.GetSizePixel());
sal_uInt16 nStyle=BUTTON_DRAW_NOFILL;
sal_uInt16 nStyle=DrawButtonFlags::NoFill;
// aDecoView.DrawButton( aRect, nStyle);
}
*/
......
include/vcl/button.hxx
Dosyayı görüntüle @ 670b7ade
......@@ -33,6 +33,7 @@
class UserDrawEvent;
class ImplCommonButtonData;
enum class DrawButtonFlags;
class VCL_DLLPUBLIC Button : public Control
{
......@@ -46,8 +47,8 @@ private:
Button (const Button &) SAL_DELETED_FUNCTION;
Button & operator= (const Button &) SAL_DELETED_FUNCTION;
public:
SAL_DLLPRIVATE sal_uInt16 ImplGetButtonState() const;
SAL_DLLPRIVATE sal_uInt16& ImplGetButtonState();
SAL_DLLPRIVATE DrawButtonFlags ImplGetButtonState() const;
SAL_DLLPRIVATE DrawButtonFlags& ImplGetButtonState();
SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( OUString& rText, WinBits nWinStyle, sal_uLong nDrawFlags );
SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize,
bool bLayout, sal_uLong nImageSep, sal_uLong nDrawFlags,
......@@ -143,7 +144,7 @@ protected:
using Window::ImplInit;
public:
SAL_DLLPRIVATE void ImplSetDefButton( bool bSet );
SAL_DLLPRIVATE void ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext, Rectangle& rRect, sal_uInt16 nStyle);
SAL_DLLPRIVATE void ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext, Rectangle& rRect, DrawButtonFlags nStyle);
SAL_DLLPRIVATE static bool ImplHitTestPushButton(vcl::Window* pDev, const Point& rPos);
SAL_DLLPRIVATE bool ImplIsDefButton() const;
......@@ -371,7 +372,7 @@ public:
bool GetSavedValue() const { return mbSaveValue; }
bool IsValueChangedFromSaved() const { return mbSaveValue != IsChecked(); }
static Image GetRadioImage( const AllSettings& rSettings, sal_uInt16 nFlags );
static Image GetRadioImage( const AllSettings& rSettings, DrawButtonFlags nFlags );
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
......@@ -482,7 +483,7 @@ public:
TriState GetSavedValue() const { return meSaveValue; }
bool IsValueChangedFromSaved() const { return meSaveValue != GetState(); }
static Image GetCheckImage( const AllSettings& rSettings, sal_uInt16 nFlags );
static Image GetCheckImage( const AllSettings& rSettings, DrawButtonFlags nFlags );
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
......
include/vcl/decoview.hxx
Dosyayı görüntüle @ 670b7ade
......@@ -75,19 +75,27 @@ enum class DrawHighlightFrameStyle
};
// Flags for DrawButton()
#define BUTTON_DRAW_DEFAULT ((sal_uInt16)0x0001)
#define BUTTON_DRAW_NOLIGHTBORDER ((sal_uInt16)0x0002)
#define BUTTON_DRAW_PRESSED ((sal_uInt16)0x0004)
#define BUTTON_DRAW_CHECKED ((sal_uInt16)0x0008)
#define BUTTON_DRAW_DONTKNOW ((sal_uInt16)0x0010)
#define BUTTON_DRAW_MONO ((sal_uInt16)0x0020)
#define BUTTON_DRAW_NOFILL ((sal_uInt16)0x0040)
#define BUTTON_DRAW_DISABLED ((sal_uInt16)0x0080)
#define BUTTON_DRAW_HIGHLIGHT ((sal_uInt16)0x0100)
#define BUTTON_DRAW_FLAT ((sal_uInt16)0x0200)
#define BUTTON_DRAW_NOLEFTLIGHTBORDER ((sal_uInt16)0x1000)
#define BUTTON_DRAW_NOTEXT ((sal_uInt16)0x2000)
#define BUTTON_DRAW_NOIMAGE ((sal_uInt16)0x4000)
enum class DrawButtonFlags
{
NONE = 0x0000,
Default = 0x0001,
NoLightBorder = 0x0002,
Pressed = 0x0004,
Checked = 0x0008,
DontKnow = 0x0010,
Mono = 0x0020,
NoFill = 0x0040,
Disabled = 0x0080,
Highlight = 0x0100,
Flat = 0x0200,
NoLeftLightBorder = 0x1000,
NoText = 0x2000,
NoImage = 0x4000,
};
namespace o3tl
{
template<> struct typed_flags<DrawButtonFlags> : is_typed_flags<DrawButtonFlags, 0x73ff> {};
}
class VCL_DLLPUBLIC DecorationView
{
......@@ -105,7 +113,7 @@ public:
void DrawHighlightFrame( const Rectangle& rRect,
DrawHighlightFrameStyle nStyle = DrawHighlightFrameStyle::Out, bool bTestBackground = false );
Rectangle DrawFrame( const Rectangle& rRect, DrawFrameStyle nStyle = DrawFrameStyle::Out, DrawFrameFlags nFlags = DrawFrameFlags::NONE );
Rectangle DrawButton( const Rectangle& rRect, sal_uInt16 nStyle );
Rectangle DrawButton( const Rectangle& rRect, DrawButtonFlags nStyle );
void DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical = true );
void DrawHandle(const Rectangle& rRectangle, bool bVertical = true);
};
......
sc/source/ui/cctrl/cbuttonw.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -70,10 +70,10 @@ void ScDDComboBoxButton::Draw( const Point& rAt,
DecorationView aDecoView( pOut);
sal_uInt16 nButtonStyle = BUTTON_DRAW_DEFAULT;
DrawButtonFlags nButtonStyle = DrawButtonFlags::Default;
if( bBtnIn ) // gedrueckt?
{
nButtonStyle = BUTTON_DRAW_PRESSED;
nButtonStyle = DrawButtonFlags::Pressed;
}
aInnerRect=aDecoView.DrawButton( aBtnRect, nButtonStyle );
......
svtools/source/contnr/svlbitm.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -141,21 +141,21 @@ void SvLBoxButtonData::SetDefaultImages( const Control* pCtrl )
if ( pImpl->bShowRadioButton )
{
SetImage(SvBmp::UNCHECKED, RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT ) );
SetImage(SvBmp::CHECKED, RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED ) );
SetImage(SvBmp::HICHECKED, RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED ) );
SetImage(SvBmp::HIUNCHECKED, RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED ) );
SetImage(SvBmp::TRISTATE, RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW ) );
SetImage(SvBmp::HITRISTATE, RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED ) );
SetImage(SvBmp::UNCHECKED, RadioButton::GetRadioImage( rSettings, DrawButtonFlags::Default ) );
SetImage(SvBmp::CHECKED, RadioButton::GetRadioImage( rSettings, DrawButtonFlags::Checked ) );
SetImage(SvBmp::HICHECKED, RadioButton::GetRadioImage( rSettings, DrawButtonFlags::Checked | DrawButtonFlags::Pressed ) );
SetImage(SvBmp::HIUNCHECKED, RadioButton::GetRadioImage( rSettings, DrawButtonFlags::Default | DrawButtonFlags::Pressed ) );
SetImage(SvBmp::TRISTATE, RadioButton::GetRadioImage( rSettings, DrawButtonFlags::DontKnow ) );
SetImage(SvBmp::HITRISTATE, RadioButton::GetRadioImage( rSettings, DrawButtonFlags::DontKnow | DrawButtonFlags::Pressed ) );
}
else
{
SetImage(SvBmp::UNCHECKED, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT ) );
SetImage(SvBmp::CHECKED, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED ) );
SetImage(SvBmp::HICHECKED, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED ) );
SetImage(SvBmp::HIUNCHECKED, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED ) );
SetImage(SvBmp::TRISTATE, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW ) );
SetImage(SvBmp::HITRISTATE, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED ) );
SetImage(SvBmp::UNCHECKED, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default ) );
SetImage(SvBmp::CHECKED, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked ) );
SetImage(SvBmp::HICHECKED, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked | DrawButtonFlags::Pressed ) );
SetImage(SvBmp::HIUNCHECKED, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default | DrawButtonFlags::Pressed ) );
SetImage(SvBmp::TRISTATE, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::DontKnow ) );
SetImage(SvBmp::HITRISTATE, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::DontKnow | DrawButtonFlags::Pressed ) );
}
}
......
vcl/inc/brdwin.hxx
Dosyayı görüntüle @ 670b7ade
......@@ -23,6 +23,7 @@
#include <vcl/window.hxx>
class ImplBorderWindowView;
enum class DrawButtonFlags;
#define BORDERWINDOW_STYLE_OVERLAP ((sal_uInt16)0x0001)
#define BORDERWINDOW_STYLE_BORDER ((sal_uInt16)0x0002)
......@@ -176,41 +177,41 @@ struct ImplBorderFrameData
{
VclPtr<ImplBorderWindow> mpBorderWindow;
VclPtr<OutputDevice> mpOutDev;
Rectangle maTitleRect;
Rectangle maPinRect;
Rectangle maCloseRect;
Rectangle maRollRect;
Rectangle maDockRect;
Rectangle maMenuRect;
Rectangle maHideRect;
Rectangle maHelpRect;
Point maMouseOff;
long mnWidth;
long mnHeight;
long mnTrackX;
long mnTrackY;
long mnTrackWidth;
long mnTrackHeight;
sal_Int32 mnLeftBorder;
sal_Int32 mnTopBorder;
sal_Int32 mnRightBorder;
sal_Int32 mnBottomBorder;
long mnNoTitleTop;
long mnBorderSize;
long mnTitleHeight;
long mnTitleOff;
sal_uInt16 mnHitTest;
sal_uInt16 mnPinState;
sal_uInt16 mnCloseState;
sal_uInt16 mnRollState;
sal_uInt16 mnDockState;
sal_uInt16 mnMenuState;
sal_uInt16 mnHideState;
sal_uInt16 mnHelpState;
sal_uInt16 mnTitleType;
bool mbFloatWindow;
bool mbDragFull;
bool mbTitleClipped;
Rectangle maTitleRect;
Rectangle maPinRect;
Rectangle maCloseRect;
Rectangle maRollRect;
Rectangle maDockRect;
Rectangle maMenuRect;
Rectangle maHideRect;
Rectangle maHelpRect;
Point maMouseOff;
long mnWidth;
long mnHeight;
long mnTrackX;
long mnTrackY;
long mnTrackWidth;
long mnTrackHeight;
sal_Int32 mnLeftBorder;
sal_Int32 mnTopBorder;
sal_Int32 mnRightBorder;
sal_Int32 mnBottomBorder;
long mnNoTitleTop;
long mnBorderSize;
long mnTitleHeight;
long mnTitleOff;
sal_uInt16 mnHitTest;
DrawButtonFlags mnPinState;
DrawButtonFlags mnCloseState;
DrawButtonFlags mnRollState;
DrawButtonFlags mnDockState;
DrawButtonFlags mnMenuState;
DrawButtonFlags mnHideState;
DrawButtonFlags mnHelpState;
sal_uInt16 mnTitleType;
bool mbFloatWindow;
bool mbDragFull;
bool mbTitleClipped;
};
class ImplBorderWindowView
......
vcl/source/control/button.cxx
Dosyayı görüntüle @ 670b7ade
This diff is collapsed.
vcl/source/control/scrbar.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -631,7 +631,7 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
{
DecorationView aDecoView(&rRenderContext);
Rectangle aTempRect;
sal_uInt16 nStyle;
DrawButtonFlags nStyle;
const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
SymbolType eSymbolType;
bool bEnabled = IsEnabled();
......@@ -653,9 +653,9 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
if ((nDrawFlags & SCRBAR_DRAW_BTN1) && (!pWin || !ImplDrawNative(rRenderContext, SCRBAR_DRAW_BTN1)))
{
nStyle = BUTTON_DRAW_NOLIGHTBORDER;
nStyle = DrawButtonFlags::NoLightBorder;
if (mnStateFlags & SCRBAR_STATE_BTN1_DOWN)
nStyle |= BUTTON_DRAW_PRESSED;
nStyle |= DrawButtonFlags::Pressed;
aTempRect = aDecoView.DrawButton( maBtn1Rect, nStyle );
ImplCalcSymbolRect( aTempRect );
DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE;
......@@ -680,9 +680,9 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
if ((nDrawFlags & SCRBAR_DRAW_BTN2) && (!pWin || !ImplDrawNative(rRenderContext, SCRBAR_DRAW_BTN2)))
{
nStyle = BUTTON_DRAW_NOLIGHTBORDER;
nStyle = DrawButtonFlags::NoLightBorder;
if (mnStateFlags & SCRBAR_STATE_BTN2_DOWN)
nStyle |= BUTTON_DRAW_PRESSED;
nStyle |= DrawButtonFlags::Pressed;
aTempRect = aDecoView.DrawButton(maBtn2Rect, nStyle);
ImplCalcSymbolRect(aTempRect);
DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE;
......@@ -713,7 +713,7 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
{
if (bEnabled)
{
nStyle = BUTTON_DRAW_NOLIGHTBORDER;
nStyle = DrawButtonFlags::NoLightBorder;
aTempRect = aDecoView.DrawButton(maThumbRect, nStyle);
}
else
......
vcl/source/control/slider.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -308,7 +308,7 @@ void Slider::ImplCalc( bool bUpdate )
void Slider::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags)
{
DecorationView aDecoView(&rRenderContext);
sal_uInt16 nStyle;
DrawButtonFlags nStyle;
const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
bool bEnabled = IsEnabled();
......@@ -428,9 +428,9 @@ void Slider::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags)
{
if (bEnabled)
{
nStyle = 0;
nStyle = DrawButtonFlags::NONE;
if (mnStateFlags & SLIDER_STATE_THUMB_DOWN)
nStyle |= BUTTON_DRAW_PRESSED;
nStyle |= DrawButtonFlags::Pressed;
aDecoView.DrawButton(maThumbRect, nStyle);
}
else
......
vcl/source/control/spinfld.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -143,7 +143,7 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow
{
DecorationView aDecoView(&rRenderContext);
sal_uInt16 nStyle = BUTTON_DRAW_NOLEFTLIGHTBORDER;
DrawButtonFlags nStyle = DrawButtonFlags::NoLeftLightBorder;
DrawSymbolFlags nSymStyle = DrawSymbolFlags::NONE;
SymbolType eType1, eType2;
......@@ -178,9 +178,9 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow
}
// draw upper/left Button
sal_uInt16 nTempStyle = nStyle;
DrawButtonFlags nTempStyle = nStyle;
if ( bUpperIn )
nTempStyle |= BUTTON_DRAW_PRESSED;
nTempStyle |= DrawButtonFlags::Pressed;
bool bNativeOK = false;
Rectangle aUpRect;
......@@ -224,7 +224,7 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow
// draw lower/right Button
if (bLowerIn)
nStyle |= BUTTON_DRAW_PRESSED;
nStyle |= DrawButtonFlags::Pressed;
Rectangle aLowRect;
if(!bNativeOK)
aLowRect = aDecoView.DrawButton(rLowerRect, nStyle);
......@@ -613,9 +613,9 @@ void SpinField::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRec
{
DecorationView aView(&rRenderContext);
sal_uInt16 nStyle = BUTTON_DRAW_NOLIGHTBORDER;
DrawButtonFlags nStyle = DrawButtonFlags::NoLightBorder;
if (mbInDropDown)
nStyle |= BUTTON_DRAW_PRESSED;
nStyle |= DrawButtonFlags::Pressed;
Rectangle aInnerRect = aView.DrawButton(maDropDownRect, nStyle);
SymbolType eSymbol = SymbolType::SPIN_DOWN;
......@@ -1023,7 +1023,7 @@ void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
if ( GetStyle() & WB_DROPDOWN )
{
DecorationView aView( pDev );
sal_uInt16 nStyle = BUTTON_DRAW_NOLIGHTBORDER;
DrawButtonFlags nStyle = DrawButtonFlags::NoLightBorder;
Rectangle aInnerRect = aView.DrawButton( aDD, nStyle );
SymbolType eSymbol = SymbolType::SPIN_DOWN;
if ( GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_SPINUPDOWN )
......
vcl/source/window/brdwin.cxx
Dosyayı görüntüle @ 670b7ade
This diff is collapsed.
vcl/source/window/decoview.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -23,10 +23,10 @@
#include <vcl/window.hxx>
#include <vcl/ctrl.hxx>
#define BUTTON_DRAW_FLATTEST (BUTTON_DRAW_FLAT | \
BUTTON_DRAW_PRESSED | \
BUTTON_DRAW_CHECKED | \
BUTTON_DRAW_HIGHLIGHT)
#define BUTTON_DRAW_FLATTEST (DrawButtonFlags::Flat | \
DrawButtonFlags::Pressed | \
DrawButtonFlags::Checked | \
DrawButtonFlags::Highlight)
using namespace std;
......@@ -490,16 +490,16 @@ void ImplDraw2ColorFrame( OutputDevice *const pDev, Rectangle& rRect,
}
void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
const sal_uInt16 nStyle )
const DrawButtonFlags nStyle )
{
const StyleSettings& rStyleSettings = pDev->GetSettings().GetStyleSettings();
if ( (nStyle & BUTTON_DRAW_MONO) ||
if ( (nStyle & DrawButtonFlags::Mono) ||
(rStyleSettings.GetOptions() & STYLE_OPTION_MONO) )
{
const Color aBlackColor( COL_BLACK );
if ( nStyle & BUTTON_DRAW_DEFAULT )
if ( nStyle & DrawButtonFlags::Default )
{
// default selection shows a wider border
ImplDrawDPILineRect( pDev, aFillRect, &aBlackColor );
......@@ -520,7 +520,7 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
pDev->SetLineColor();
pDev->SetFillColor( aBlackColor );
const Rectangle aOrigFillRect(aFillRect);
if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
if ( nStyle & (DrawButtonFlags::Pressed | DrawButtonFlags::Checked) )
{
// shrink fill rect
aFillRect.Left() += aBrdSize.Width();
......@@ -543,7 +543,7 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
aOrigFillRect.Right(), aOrigFillRect.Bottom() ) );
}
if ( !(nStyle & BUTTON_DRAW_NOFILL) )
if ( !(nStyle & DrawButtonFlags::NoFill) )
{
// Hack: in monochrome mode on printers we like to have grey buttons
if ( pDev->GetOutDevType() == OUTDEV_PRINTER )
......@@ -555,13 +555,13 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
}
else
{
if ( nStyle & BUTTON_DRAW_DEFAULT )
if ( nStyle & DrawButtonFlags::Default )
{
const Color aDefBtnColor = rStyleSettings.GetDarkShadowColor();
ImplDrawDPILineRect( pDev, aFillRect, &aDefBtnColor );
}
if ( nStyle & BUTTON_DRAW_NOLEFTLIGHTBORDER )
if ( nStyle & DrawButtonFlags::NoLeftLightBorder )
{
pDev->SetLineColor( rStyleSettings.GetLightBorderColor() );
pDev->DrawLine( Point( aFillRect.Left(), aFillRect.Top() ),
......@@ -571,18 +571,18 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
Color aColor1;
Color aColor2;
if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
if ( nStyle & (DrawButtonFlags::Pressed | DrawButtonFlags::Checked) )
{
aColor1 = rStyleSettings.GetDarkShadowColor();
aColor2 = rStyleSettings.GetLightColor();
}
else
{
if ( nStyle & BUTTON_DRAW_NOLIGHTBORDER )
if ( nStyle & DrawButtonFlags::NoLightBorder )
aColor1 = rStyleSettings.GetLightBorderColor();
else
aColor1 = rStyleSettings.GetLightColor();
if ( (nStyle & BUTTON_DRAW_FLATTEST) == BUTTON_DRAW_FLAT )
if ( (nStyle & BUTTON_DRAW_FLATTEST) == DrawButtonFlags::Flat )
aColor2 = rStyleSettings.GetShadowColor();
else
aColor2 = rStyleSettings.GetDarkShadowColor();
......@@ -590,16 +590,16 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
ImplDraw2ColorFrame( pDev, aFillRect, aColor1, aColor2 );
if ( !((nStyle & BUTTON_DRAW_FLATTEST) == BUTTON_DRAW_FLAT) )
if ( !((nStyle & BUTTON_DRAW_FLATTEST) == DrawButtonFlags::Flat) )
{
if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
if ( nStyle & (DrawButtonFlags::Pressed | DrawButtonFlags::Checked) )
{
aColor1 = rStyleSettings.GetShadowColor();
aColor2 = rStyleSettings.GetLightBorderColor();
}
else
{
if ( nStyle & BUTTON_DRAW_NOLIGHTBORDER )
if ( nStyle & DrawButtonFlags::NoLightBorder )
aColor1 = rStyleSettings.GetLightColor();
else
aColor1 = rStyleSettings.GetLightBorderColor();
......@@ -608,10 +608,10 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
ImplDraw2ColorFrame( pDev, aFillRect, aColor1, aColor2 );
}
if ( !(nStyle & BUTTON_DRAW_NOFILL) )
if ( !(nStyle & DrawButtonFlags::NoFill) )
{
pDev->SetLineColor();
if ( nStyle & (BUTTON_DRAW_CHECKED | BUTTON_DRAW_DONTKNOW) )
if ( nStyle & (DrawButtonFlags::Checked | DrawButtonFlags::DontKnow) )
pDev->SetFillColor( rStyleSettings.GetCheckedColor() );
else
pDev->SetFillColor( rStyleSettings.GetFaceColor() );
......@@ -969,7 +969,7 @@ Rectangle DecorationView::DrawFrame( const Rectangle& rRect, DrawFrameStyle nSty
return aRect;
}
Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle )
Rectangle DecorationView::DrawButton( const Rectangle& rRect, DrawButtonFlags nStyle )
{
if ( rRect.IsEmpty() )
{
......@@ -997,17 +997,17 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle
--aRect.Right();
--aRect.Bottom();
if ( nStyle & BUTTON_DRAW_NOLIGHTBORDER )
if ( nStyle & DrawButtonFlags::NoLightBorder )
{
++aRect.Left();
++aRect.Top();
}
else if ( nStyle & BUTTON_DRAW_NOLEFTLIGHTBORDER )
else if ( nStyle & DrawButtonFlags::NoLeftLightBorder )
{
++aRect.Left();
}
if ( nStyle & BUTTON_DRAW_PRESSED )
if ( nStyle & DrawButtonFlags::Pressed )
{
if ( (aRect.GetHeight() > 10) && (aRect.GetWidth() > 10) )
{
......@@ -1024,7 +1024,7 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle
aRect.Bottom() -= 2;
}
}
else if ( nStyle & BUTTON_DRAW_CHECKED )
else if ( nStyle & DrawButtonFlags::Checked )
{
aRect.Left() += 3;
aRect.Top() += 3;
......
vcl/source/window/toolbox.cxx
Dosyayı görüntüle @ 670b7ade
......@@ -2981,7 +2981,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
long nOffY = SMALLBUTTON_OFF_NORMAL_Y;
long nImageOffX = 0;
long nImageOffY = 0;
sal_uInt16 nStyle = 0;
DrawButtonFlags nStyle = DrawButtonFlags::NONE;
// draw separators in flat style only
if ( !bLayout &&
......@@ -3056,15 +3056,15 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
if ( pItem->meState == TRISTATE_TRUE )
{
nStyle |= BUTTON_DRAW_CHECKED;
nStyle |= DrawButtonFlags::Checked;
}
else if ( pItem->meState == TRISTATE_INDET )
{
nStyle |= BUTTON_DRAW_DONTKNOW;
nStyle |= DrawButtonFlags::DontKnow;
}
if ( nHighlight == 1 )
{
nStyle |= BUTTON_DRAW_PRESSED;
nStyle |= DrawButtonFlags::Pressed;
}
if( ! bLayout )
......
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