mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move Button to vcl/toolkit

Browse Source 
Change-Id: I11e4fbab2e70342683febacf444fbe08dabf2417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107346
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2020-12-07 11:35:32 +00:00
parent 6245dba005
commit 2b7a38bbf6
10 changed files with 211 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/source/standard/vclxaccessiblebutton.cxx
View File

@@ -29,7 +29,7 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <strings.hxx> #include <strings.hxx>
#include <vcl/button.hxx> #include <vcl/toolkit/button.hxx>
#include <vcl/event.hxx> #include <vcl/event.hxx>
#include <vcl/vclevent.hxx> #include <vcl/vclevent.hxx>

231
include/vcl/button.hxx
View File

@@ -1,231 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_VCL_BUTTON_HXX
#define INCLUDED_VCL_BUTTON_HXX
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/image.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/vclenum.hxx>
#include <memory>
#include <vector>
namespace com::sun::star::frame { struct FeatureStateEvent; }
template <class T> class VclPtr;
class Color;
class ImplCommonButtonData;
enum class DrawButtonFlags;
class VCL_DLLPUBLIC Button : public Control
{
private:
std::unique_ptr<ImplCommonButtonData> mpButtonData;
Link<Button*,void> maClickHdl;
/// Command URL (like .uno:Save) in case the button should handle it.
OUString maCommand;
Button (const Button &) = delete;
Button & operator= (const Button &) = delete;
public:
SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( WinBits nWinStyle, DrawFlags nDrawFlags );
SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize,
sal_uLong nImageSep,
DrawTextFlags nTextStyle, tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false );
SAL_DLLPRIVATE void ImplSetFocusRect( const tools::Rectangle &rFocusRect );
SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const;
SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign );
/// The x-coordinate of the vertical separator line, use in MenuButton subclass only.
SAL_DLLPRIVATE tools::Long ImplGetSeparatorX() const;
SAL_DLLPRIVATE void ImplSetSeparatorX( tools::Long nX );
protected:
explicit Button( WindowType nType );
// for drawing RadioButton or CheckButton that has Text and/or Image
SAL_DLLPRIVATE void ImplDrawRadioCheck(OutputDevice* pDev, WinBits nWinStyle, DrawFlags nDrawFlags,
const Point& rPos, const Size& rSize,
const Size& rImageSize, tools::Rectangle& rStateRect,
tools::Rectangle& rMouseRect);
SAL_DLLPRIVATE tools::Long ImplGetImageToTextDistance() const;
public:
virtual ~Button() override;
virtual void dispose() override;
virtual void Click();
void SetClickHdl( const Link<Button*,void>& rLink ) { maClickHdl = rLink; }
const Link<Button*,void>& GetClickHdl() const { return maClickHdl; }
/// Setup handler for UNO commands so that commands like .uno:Something are handled automagically by this button.
void SetCommandHandler(const OUString& aCommand);
OUString const & GetCommand() const { return maCommand; }
void SetModeImage( const Image& rImage );
Image const & GetModeImage( ) const;
bool HasImage() const;
void SetImageAlign( ImageAlign eAlign );
ImageAlign GetImageAlign() const;
DrawButtonFlags GetButtonState() const;
DrawButtonFlags& GetButtonState();
/// Set an image to use as the complete render view of a custom button,
/// instead of the usual contents of a button
void SetCustomButtonImage( const Image& rImage );
Image const & GetCustomButtonImage() const;
bool IsSmallSymbol() const;
void SetSmallSymbol();
virtual bool set_property(const OString &rKey, const OUString &rValue) override;
/// Sets the button state according to the FeatureStateEvent emitted by a Uno state change.
virtual void statusChanged(const css::frame::FeatureStateEvent& rEvent);
virtual FactoryFunction GetUITestFactory() const override;
virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
protected:
/// Handler for click, in case we want the button to handle uno commands (.uno:Something).
DECL_STATIC_LINK(Button, dispatchCommandHandler, Button*, void);
};
enum class PushButtonDropdownStyle
{
NONE = 0x0000,
MenuButton = 0x0002, //visual down arrow
SplitMenuButton = 0x0003, //visual down arrow and separator line
};
class VCL_DLLPUBLIC PushButton : public Button
{
public:
SAL_DLLPRIVATE void ImplSetDefButton( bool bSet );
SAL_DLLPRIVATE void ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext, tools::Rectangle& rRect, DrawButtonFlags nStyle);
SAL_DLLPRIVATE static bool ImplHitTestPushButton(vcl::Window const * pDev, const Point& rPos);
SAL_DLLPRIVATE bool ImplIsDefButton() const;
explicit PushButton( vcl::Window* pParent, WinBits nStyle = 0 );
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
virtual void Tracking( const TrackingEvent& rTEvt ) override;
virtual void KeyInput( const KeyEvent& rKEvt ) override;
virtual void KeyUp( const KeyEvent& rKEvt ) override;
virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
virtual void Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags ) override;
virtual void Resize() override;
virtual void GetFocus() override;
virtual void LoseFocus() override;
virtual void StateChanged( StateChangedType nType ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
void Toggle();
void SetSymbol( SymbolType eSymbol );
SymbolType GetSymbol() const { return meSymbol; }
void SetSymbolAlign( SymbolAlign eAlign );
void SetDropDown( PushButtonDropdownStyle nStyle );
void SetState( TriState eState );
TriState GetState() const { return meState; }
virtual void statusChanged(const css::frame::FeatureStateEvent& rEvent) override;
void Check( bool bCheck = true );
bool IsChecked() const;
void SetPressed( bool bPressed );
bool IsPressed() const { return mbPressed; }
void EndSelection();
Size CalcMinimumSize() const;
virtual Size GetOptimalSize() const override;
virtual bool set_property(const OString &rKey, const OUString &rValue) override;
virtual void ShowFocus(const tools::Rectangle& rRect) override;
void setAction(bool bIsAction)
{
mbIsAction = bIsAction;
}
bool isAction() const
{
return mbIsAction;
}
protected:
PushButtonDropdownStyle mnDDStyle;
bool mbIsActive;
SAL_DLLPRIVATE void ImplInitPushButtonData();
SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle );
SAL_DLLPRIVATE void ImplInitSettings( bool bBackground );
SAL_DLLPRIVATE void ImplDrawPushButtonContent(OutputDevice* pDev, DrawFlags nDrawFlags,
const tools::Rectangle& rRect, bool bMenuBtnSep,
DrawButtonFlags nButtonFlags);
SAL_DLLPRIVATE void ImplDrawPushButton(vcl::RenderContext& rRenderContext);
using Button::ImplGetTextStyle;
SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( DrawFlags nDrawFlags ) const;
SAL_DLLPRIVATE bool IsSymbol() const { return ( (meSymbol != SymbolType::DONTKNOW) && (meSymbol != SymbolType::IMAGE) ); }
PushButton( const PushButton & ) = delete;
PushButton& operator=( const PushButton & )
= delete;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
using Control::ImplInitSettings;
using Window::ImplInit;
explicit PushButton( WindowType nType );
virtual void FillLayoutData() const override;
virtual const vcl::Font&
GetCanonicalFont( const StyleSettings& _rStyle ) const override;
virtual const Color&
GetCanonicalTextColor( const StyleSettings& _rStyle ) const override;
private:
SymbolType meSymbol;
TriState meState;
bool mbPressed;
bool mbIsAction;
};
inline void PushButton::Check( bool bCheck )
{
SetState( bCheck ? TRISTATE_TRUE : TRISTATE_FALSE );
}
inline bool PushButton::IsChecked() const
{
return (GetState() == TRISTATE_TRUE);
}
#endif // INCLUDED_VCL_BUTTON_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

206
include/vcl/toolkit/button.hxx
View File

@@ -22,7 +22,211 @@
#error "don't use this in new code" #error "don't use this in new code"
#endif #endif
#include <vcl/button.hxx> #include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/image.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/vclenum.hxx>
#include <memory>
#include <vector>
namespace com::sun::star::frame { struct FeatureStateEvent; }
template <class T> class VclPtr;
class Color;
class ImplCommonButtonData;
enum class DrawButtonFlags;
class VCL_DLLPUBLIC Button : public Control
{
private:
std::unique_ptr<ImplCommonButtonData> mpButtonData;
Link<Button*,void> maClickHdl;
/// Command URL (like .uno:Save) in case the button should handle it.
OUString maCommand;
Button (const Button &) = delete;
Button & operator= (const Button &) = delete;
public:
SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( WinBits nWinStyle, DrawFlags nDrawFlags );
SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize,
sal_uLong nImageSep,
DrawTextFlags nTextStyle, tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false );
SAL_DLLPRIVATE void ImplSetFocusRect( const tools::Rectangle &rFocusRect );
SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const;
SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign );
/// The x-coordinate of the vertical separator line, use in MenuButton subclass only.
SAL_DLLPRIVATE tools::Long ImplGetSeparatorX() const;
SAL_DLLPRIVATE void ImplSetSeparatorX( tools::Long nX );
protected:
explicit Button( WindowType nType );
// for drawing RadioButton or CheckButton that has Text and/or Image
SAL_DLLPRIVATE void ImplDrawRadioCheck(OutputDevice* pDev, WinBits nWinStyle, DrawFlags nDrawFlags,
const Point& rPos, const Size& rSize,
const Size& rImageSize, tools::Rectangle& rStateRect,
tools::Rectangle& rMouseRect);
SAL_DLLPRIVATE tools::Long ImplGetImageToTextDistance() const;
public:
virtual ~Button() override;
virtual void dispose() override;
virtual void Click();
void SetClickHdl( const Link<Button*,void>& rLink ) { maClickHdl = rLink; }
const Link<Button*,void>& GetClickHdl() const { return maClickHdl; }
/// Setup handler for UNO commands so that commands like .uno:Something are handled automagically by this button.
void SetCommandHandler(const OUString& aCommand);
OUString const & GetCommand() const { return maCommand; }
void SetModeImage( const Image& rImage );
Image const & GetModeImage( ) const;
bool HasImage() const;
void SetImageAlign( ImageAlign eAlign );
ImageAlign GetImageAlign() const;
DrawButtonFlags GetButtonState() const;
DrawButtonFlags& GetButtonState();
/// Set an image to use as the complete render view of a custom button,
/// instead of the usual contents of a button
void SetCustomButtonImage( const Image& rImage );
Image const & GetCustomButtonImage() const;
bool IsSmallSymbol() const;
void SetSmallSymbol();
virtual bool set_property(const OString &rKey, const OUString &rValue) override;
/// Sets the button state according to the FeatureStateEvent emitted by a Uno state change.
virtual void statusChanged(const css::frame::FeatureStateEvent& rEvent);
virtual FactoryFunction GetUITestFactory() const override;
virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
protected:
/// Handler for click, in case we want the button to handle uno commands (.uno:Something).
DECL_STATIC_LINK(Button, dispatchCommandHandler, Button*, void);
};
enum class PushButtonDropdownStyle
{
NONE = 0x0000,
MenuButton = 0x0002, //visual down arrow
SplitMenuButton = 0x0003, //visual down arrow and separator line
};
class VCL_DLLPUBLIC PushButton : public Button
{
public:
SAL_DLLPRIVATE void ImplSetDefButton( bool bSet );
SAL_DLLPRIVATE void ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext, tools::Rectangle& rRect, DrawButtonFlags nStyle);
SAL_DLLPRIVATE static bool ImplHitTestPushButton(vcl::Window const * pDev, const Point& rPos);
SAL_DLLPRIVATE bool ImplIsDefButton() const;
explicit PushButton( vcl::Window* pParent, WinBits nStyle = 0 );
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
virtual void Tracking( const TrackingEvent& rTEvt ) override;
virtual void KeyInput( const KeyEvent& rKEvt ) override;
virtual void KeyUp( const KeyEvent& rKEvt ) override;
virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
virtual void Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags ) override;
virtual void Resize() override;
virtual void GetFocus() override;
virtual void LoseFocus() override;
virtual void StateChanged( StateChangedType nType ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
void Toggle();
void SetSymbol( SymbolType eSymbol );
SymbolType GetSymbol() const { return meSymbol; }
void SetSymbolAlign( SymbolAlign eAlign );
void SetDropDown( PushButtonDropdownStyle nStyle );
void SetState( TriState eState );
TriState GetState() const { return meState; }
virtual void statusChanged(const css::frame::FeatureStateEvent& rEvent) override;
void Check( bool bCheck = true );
bool IsChecked() const;
void SetPressed( bool bPressed );
bool IsPressed() const { return mbPressed; }
void EndSelection();
Size CalcMinimumSize() const;
virtual Size GetOptimalSize() const override;
virtual bool set_property(const OString &rKey, const OUString &rValue) override;
virtual void ShowFocus(const tools::Rectangle& rRect) override;
void setAction(bool bIsAction)
{
mbIsAction = bIsAction;
}
bool isAction() const
{
return mbIsAction;
}
protected:
PushButtonDropdownStyle mnDDStyle;
bool mbIsActive;
SAL_DLLPRIVATE void ImplInitPushButtonData();
SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle );
SAL_DLLPRIVATE void ImplInitSettings( bool bBackground );
SAL_DLLPRIVATE void ImplDrawPushButtonContent(OutputDevice* pDev, DrawFlags nDrawFlags,
const tools::Rectangle& rRect, bool bMenuBtnSep,
DrawButtonFlags nButtonFlags);
SAL_DLLPRIVATE void ImplDrawPushButton(vcl::RenderContext& rRenderContext);
using Button::ImplGetTextStyle;
SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( DrawFlags nDrawFlags ) const;
SAL_DLLPRIVATE bool IsSymbol() const { return ( (meSymbol != SymbolType::DONTKNOW) && (meSymbol != SymbolType::IMAGE) ); }
PushButton( const PushButton & ) = delete;
PushButton& operator=( const PushButton & )
= delete;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
using Control::ImplInitSettings;
using Window::ImplInit;
explicit PushButton( WindowType nType );
virtual void FillLayoutData() const override;
virtual const vcl::Font&
GetCanonicalFont( const StyleSettings& _rStyle ) const override;
virtual const Color&
GetCanonicalTextColor( const StyleSettings& _rStyle ) const override;
private:
SymbolType meSymbol;
TriState meState;
bool mbPressed;
bool mbIsAction;
};
inline void PushButton::Check( bool bCheck )
{
SetState( bCheck ? TRISTATE_TRUE : TRISTATE_FALSE );
}
inline bool PushButton::IsChecked() const
{
return (GetState() == TRISTATE_TRUE);
}
class VCL_DLLPUBLIC OKButton final : public PushButton class VCL_DLLPUBLIC OKButton final : public PushButton
{ {

2
include/vcl/toolkit/menubtn.hxx
View File

@@ -24,7 +24,7 @@
#endif #endif
#include <config_options.h> #include <config_options.h>
#include <vcl/button.hxx> #include <vcl/toolkit/button.hxx>
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <memory> #include <memory>

2
include/vcl/toolkit/morebtn.hxx
View File

@@ -25,7 +25,7 @@
#include <config_options.h> #include <config_options.h>
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <vcl/button.hxx> #include <vcl/toolkit/button.hxx>
#include <memory> #include <memory>
struct ImplMoreButtonData; struct ImplMoreButtonData;

1
solenv/clang-format/excludelist
View File

@@ -6405,7 +6405,6 @@ include/vcl/bitmap.hxx
include/vcl/bitmapex.hxx include/vcl/bitmapex.hxx
include/vcl/builder.hxx include/vcl/builder.hxx
include/vcl/builderfactory.hxx include/vcl/builderfactory.hxx
include/vcl/button.hxx
include/vcl/cairo.hxx include/vcl/cairo.hxx
include/vcl/canvastools.hxx include/vcl/canvastools.hxx
include/vcl/checksum.hxx include/vcl/checksum.hxx

1
vcl/inc/pch/precompiled_vcl.hxx
View File

@@ -282,7 +282,6 @@
#include <vcl/bitmap.hxx> #include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx> #include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx> #include <vcl/builder.hxx>
#include <vcl/button.hxx>
#include <vcl/canvastools.hxx> #include <vcl/canvastools.hxx>
#include <vcl/checksum.hxx> #include <vcl/checksum.hxx>
#include <vcl/commandevent.hxx> #include <vcl/commandevent.hxx>

2
vcl/source/control/DropdownBox.cxx
View File

@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <vcl/button.hxx> #include <vcl/toolkit/button.hxx>
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
#include <DropdownBox.hxx> #include <DropdownBox.hxx>

2
vcl/source/control/PriorityMergedHBox.cxx
View File

@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <vcl/button.hxx> #include <vcl/toolkit/button.hxx>
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
#include <bitmaps.hlst> #include <bitmaps.hlst>
#include <PriorityHBox.hxx> #include <PriorityHBox.hxx>

2
vcl/workben/svpclient.cxx
View File

@@ -29,7 +29,7 @@
#include <vcl/event.hxx> #include <vcl/event.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx> #include <vcl/wrkwin.hxx>
#include <vcl/button.hxx> #include <vcl/toolkit/button.hxx>
#include <vcl/toolkit/fixed.hxx> #include <vcl/toolkit/fixed.hxx>
#include <vcl/toolkit/lstbox.hxx> #include <vcl/toolkit/lstbox.hxx>
#include <vcl/bitmapex.hxx> #include <vcl/bitmapex.hxx>