[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/source
include/vcl/dockwin.hxx | 105
solenv/clang-format/excludelist |1
vcl/source/window/dockmgr.cxx|2
vcl/source/window/dockwin.cxx|2
vcl/source/window/event.cxx |2
vcl/source/window/impldockingwrapper.hxx | 131 +++
vcl/source/window/menu.cxx |6 -
vcl/source/window/toolbox.cxx|1
vcl/source/window/toolbox2.cxx |2
vcl/source/window/window.cxx |1
10 files changed, 146 insertions(+), 107 deletions(-)
New commits:
commit 81565c31829fe1141e64acb900d891e9f9705971
Author: Caolán McNamara
AuthorDate: Tue Mar 2 10:27:53 2021 +
Commit: Caolán McNamara
CommitDate: Wed Mar 3 10:20:54 2021 +0100
move ImplDockingWindowWrapper out of public header
and down to where it is needed
Change-Id: Ieded4a1b5d10ab7f9a57c2694a4684bdecc77fd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111827
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index d8f69ccd1fb5..8dbe5ead00a4 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -62,110 +62,7 @@ struct EndPopupModeData
{};
};
-/** ImplDockingWindowWrapper
- *
- * ImplDockingWindowWrapper obsoletes the DockingWindow class.
- * It is better because it can make a "normal window" dockable.
- * All DockingWindows should be converted the new class.
- */
-
-class ImplDockingWindowWrapper final
-{
-friend class ::vcl::Window;
-friend class DockingManager;
-friend class DockingWindow;
-
-private:
-
-// the original 'Docking'window
-VclPtrmpDockingWindow;
-
-// the original DockingWindow members
-VclPtr mpFloatWin;
-VclPtrmpOldBorderWin;
-VclPtrmpParent;
-Link maPopupModeEndHdl;
-Point maFloatPos;
-Point maDockPos;
-Point maMouseOff;
-SizemaMinOutSize;
-SizemaMaxOutSize;
-tools::Rectangle maDragArea;
-tools::LongmnTrackX;
-tools::LongmnTrackY;
-tools::LongmnTrackWidth;
-tools::LongmnTrackHeight;
-sal_Int32 mnDockLeft;
-sal_Int32 mnDockTop;
-sal_Int32 mnDockRight;
-sal_Int32 mnDockBottom;
-WinBits mnFloatBits;
-boolmbDockCanceled:1,
-mbDocking:1,
-mbLastFloatMode:1,
-mbDockBtn:1,
-mbHideBtn:1,
-mbStartDockingEnabled:1,
-mbLocked:1;
-
-DECL_LINK( PopupModeEnd, FloatingWindow*, void );
-voidImplEnableStartDocking() { mbStartDockingEnabled = true; }
-boolImplStartDockingEnabled() const { return
mbStartDockingEnabled; }
-voidImplPreparePopupMode();
-
-public:
-ImplDockingWindowWrapper( const vcl::Window *pWindow );
-~ImplDockingWindowWrapper();
-
-vcl::Window*GetWindow() { return mpDockingWindow; }
-voidImplStartDocking( const Point& rPos );
-
-// those methods actually call the corresponding handlers
-voidStartDocking( const Point& rPos, tools::Rectangle const &
rRect );
-boolDocking( const Point& rPos, tools::Rectangle& rRect );
-voidEndDocking( const tools::Rectangle& rRect, bool bFloatMode
);
-boolPrepareToggleFloatingMode();
-voidToggleFloatingMode();
-
-voidSetDragArea( const tools::Rectangle& rRect );
-const tools::Rectangle& GetDragArea() const { return maDragArea;}
-
-voidLock();
-voidUnlock();
-boolIsLocked() const { return mbLocked;}
-
-voidStartPopupMode( const tools::Rectangle& rRect,
FloatWinPopupFlags nPopupModeFlags );
-voidStartPopupMode( ToolBox* pParentToolBox,
FloatWinPopupFlags nPopupModeFlags );
-boolIsInPopupMode() const;
-
-voidSetPopupModeEndHdl( const Link&
rLink ) { maPopupModeEndHdl = rLink; }
-
-voidTitleButtonClick( TitleButton nButton );
-voidResizing( Size& rSize );
-voidTracking( const TrackingEvent& rTEvt );
-
-voidShowTitleButton( TitleButton nButton, bool bVisible );
-
-voidSetMinOutputSizePixel( const Size& rSize );
-
-voidSetMaxOutputSizePixel( const Size& rSize );
-
-boolIsDocking() const { return mbDocking; }
-boolIsDockingCanceled() const { return mbDockCanceled; }
-
-voidSetFloatingMode( bool bFloatMode );
-boolIsFloatingMode() const;
-SystemWindow* GetFloatingWindow() const;
-
-voidSetFloatStyle( WinBits nWinStyle );
-
[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/source
include/vcl/roadmapwizard.hxx| 319 +++---
include/vcl/wizardmachine.hxx| 301
solenv/clang-format/blacklist|1
vcl/source/control/roadmapwizard.cxx | 219 +---
vcl/source/control/wizardmachine.cxx | 366 ++-
vcl/source/control/wizimpldata.hxx | 64 ++
6 files changed, 605 insertions(+), 665 deletions(-)
New commits:
commit 04f326cee7678be86db3bb826f6f83918d7a239a
Author: Caolán McNamara
AuthorDate: Sat Sep 14 18:40:21 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Sep 15 16:25:57 2019 +0200
merge RoadmapWizard and OWizardMachine
Change-Id: Ib8c68cb5e96f8bfa9b2398946b87f3b451b3a37e
Reviewed-on: https://gerrit.libreoffice.org/78912
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/roadmapwizard.hxx b/include/vcl/roadmapwizard.hxx
index 9670c84dd13d..bae94ee05c1a 100644
--- a/include/vcl/roadmapwizard.hxx
+++ b/include/vcl/roadmapwizard.hxx
@@ -58,18 +58,118 @@ namespace vcl
n2, which share at least the first k states
(where k
is at least 1), and an arbitrary number of other states.
*/
-class VCL_DLLPUBLIC RoadmapWizard : public vcl::OWizardMachine
+class VCL_DLLPUBLIC RoadmapWizard : public ModalDialog
{
private:
-std::unique_ptr m_pImpl;
+IdlemaWizardLayoutIdle;
+SizemaPageSize;
+ImplWizPageData*mpFirstPage;
+ImplWizButtonData* mpFirstBtn;
+VclPtr mpCurTabPage;
+VclPtr mpPrevBtn;
+VclPtr mpNextBtn;
+VclPtr mpViewWindow;
+sal_uInt16 mnCurLevel;
+WindowAlign meViewAlign;
+Link maActivateHdl;
+sal_Int16 mnLeftAlignCount;
+boolmbEmptyViewMargin;
+
+DECL_DLLPRIVATE_LINK( ImplHandleWizardLayoutTimerHdl, Timer*, void );
+
+// IMPORTANT:
+// traveling pages should not be done by calling these base class
member, some mechanisms of this class
+// here (e.g. committing page data) depend on having full control over
page traveling.
+// So use the travelXXX methods if you need to travel
+
+protected:
+longLogicalCoordinateToPixel(int iCoordinate);
+/**sets the number of buttons which should be left-aligned. Normally,
buttons are right-aligned.
+
+only to be used during construction, before any layouting happened
+*/
+voidSetLeftAlignedButtonCount( sal_Int16 _nCount );
+/** declares the view area to have an empty margin
+
+Normally, the view area has a certain margin to the
top/left/bottom/right of the
+dialog. By calling this method, you can reduce this margin to 0.
+*/
+voidSetEmptyViewMargin();
+
+voidCalcAndSetSize();
public:
-RoadmapWizard(
-vcl::Window* _pParent
-);
+VclPtr m_pFinish;
+VclPtr m_pCancel;
+VclPtr m_pNextPage;
+VclPtr m_pPrevPage;
+VclPtr m_pHelp;
+
+private:
+std::unique_ptr m_xWizardImpl;
+// hold members in this structure to allow keeping compatible when
members are added
+std::unique_ptr m_xRoadmapImpl;
+
+public:
+RoadmapWizard(vcl::Window* pParent);
virtual ~RoadmapWizard( ) override;
virtual void dispose() override;
+virtual voidResize() override;
+virtual voidStateChanged( StateChangedType nStateChange )
override;
+virtual boolEventNotify( NotifyEvent& rNEvt ) override;
+
+virtual voidActivatePage();
+virtual boolDeactivatePage();
+
+virtual voidqueue_resize(StateChangedType eReason =
StateChangedType::Layout) override;
+
+boolShowPrevPage();
+boolShowNextPage();
+boolShowPage( sal_uInt16 nLevel );
+boolFinish( long nResult = 0 );
+sal_uInt16 GetCurLevel() const { return mnCurLevel; }
+
+voidAddPage( TabPage* pPage );
+voidRemovePage( TabPage* pPage );
+voidSetPage( sal_uInt16 nLevel, TabPage* pPage );
+TabPage*GetPage( sal_uInt16 nLevel ) const;
+
+voidAddButton( Button* pButton, long nOffset = 0 );
+voidRemoveButton( Button* pButton );
+
+voidSetPrevButton( PushButton* pButton ) { mpPrevBtn =
pButton; }
+voidSetNextButton( PushButton* pButton ) { mpNextBtn =
pButton; }
+
+voidSetViewWindow(
[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/source
include/vcl/animate/Animation.hxx | 129 +++-
include/vcl/animate/AnimationBitmap.hxx | 68 +---
solenv/clang-format/blacklist |4
vcl/source/animate/Animation.cxx| 486 +++-
vcl/source/animate/AnimationBitmap.cxx | 32 +-
5 files changed, 339 insertions(+), 380 deletions(-)
New commits:
commit 9afa666120d8bb045f3569a77475a58c368c03a1
Author: Tomaž Vajngerl
AuthorDate: Sat Apr 27 21:48:24 2019 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Apr 28 05:29:54 2019 +0200
move Animation, AnimationBitmap out from clang-format blacklist
Change-Id: I95fd2d4e164bf04c4457b3e20401270227e21a8f
Reviewed-on: https://gerrit.libreoffice.org/71424
Reviewed-by: Tomaž Vajngerl
Tested-by: Tomaž Vajngerl
diff --git a/include/vcl/animate/Animation.hxx
b/include/vcl/animate/Animation.hxx
index c642c3b283d9..b8b390bb0644 100644
--- a/include/vcl/animate/Animation.hxx
+++ b/include/vcl/animate/Animation.hxx
@@ -31,102 +31,85 @@ class ImplAnimView;
class VCL_DLLPUBLIC Animation
{
public:
-Animation();
-Animation( const Animation& rAnimation );
-~Animation();
+Animation();
+Animation(const Animation& rAnimation);
+~Animation();
-Animation& operator=( const Animation& rAnimation );
-booloperator==( const Animation& rAnimation ) const;
-booloperator!=( const Animation& rAnimation ) const
-{ return !(*this==rAnimation); }
+Animation& operator=(const Animation& rAnimation);
+bool operator==(const Animation& rAnimation) const;
+bool operator!=(const Animation& rAnimation) const { return !(*this ==
rAnimation); }
-voidClear();
+void Clear();
-boolStart(
-OutputDevice* pOutDev,
-const Point& rDestPt,
-const Size& rDestSz,
-long nExtraData,
-OutputDevice* pFirstFrameOutDev);
+bool Start(OutputDevice* pOutDev, const Point& rDestPt, const Size&
rDestSz, long nExtraData,
+ OutputDevice* pFirstFrameOutDev);
-voidStop( OutputDevice* pOutDev = nullptr, long nExtraData = 0
);
+void Stop(OutputDevice* pOutDev = nullptr, long nExtraData = 0);
-voidDraw( OutputDevice* pOutDev, const Point& rDestPt ) const;
-voidDraw( OutputDevice* pOutDev, const Point& rDestPt, const
Size& rDestSz ) const;
+void Draw(OutputDevice* pOutDev, const Point& rDestPt) const;
+void Draw(OutputDevice* pOutDev, const Point& rDestPt, const Size&
rDestSz) const;
-boolIsInAnimation() const { return mbIsInAnimation; }
-boolIsTransparent() const;
+bool IsInAnimation() const { return mbIsInAnimation; }
+bool IsTransparent() const;
-const Size& GetDisplaySizePixel() const { return maGlobalSize; }
-voidSetDisplaySizePixel( const Size& rSize ) { maGlobalSize =
rSize; }
+const Size& GetDisplaySizePixel() const { return maGlobalSize; }
+void SetDisplaySizePixel(const Size& rSize) { maGlobalSize = rSize; }
const BitmapEx& GetBitmapEx() const { return maBitmapEx; }
-voidSetBitmapEx( const BitmapEx& rBmpEx ) { maBitmapEx =
rBmpEx; }
+void SetBitmapEx(const BitmapEx& rBmpEx) { maBitmapEx = rBmpEx; }
-sal_uInt32 GetLoopCount() const { return mnLoopCount; }
-voidSetLoopCount(const sal_uInt32 nLoopCount);
-voidResetLoopCount();
+sal_uInt32 GetLoopCount() const { return mnLoopCount; }
+void SetLoopCount(const sal_uInt32 nLoopCount);
+void ResetLoopCount();
-voidSetNotifyHdl( const Link& rLink ) {
maNotifyLink = rLink; }
-const Link& GetNotifyHdl() const { return maNotifyLink; }
+void SetNotifyHdl(const Link& rLink) { maNotifyLink =
rLink; }
+const Link& GetNotifyHdl() const { return maNotifyLink; }
-std::vector< std::unique_ptr >& GetAnimationFrames() {
return maList; }
-size_t Count() const { return maList.size(); }
-boolInsert( const AnimationBitmap& rAnimationBitmap );
-const AnimationBitmap&
-Get( sal_uInt16 nAnimation ) const;
-voidReplace( const AnimationBitmap& rNewAnimationBmp,
sal_uInt16 nAnimation );
+std::vector>& GetAnimationFrames() {
return maList; }
+size_t Count() const { return maList.size(); }
+bool Insert(const AnimationBitmap& rAnimationBitmap);
+const AnimationBitmap& Get(sal_uInt16 nAnimation) const;
+void Replace(const AnimationBitmap& rNewAnimationBmp, sal_uInt16
nAnimation);
-sal_uLong GetSizeBytes() const;
-BitmapChecksum GetChecksum() const;
+sal_uLong GetSizeBytes() const;
+BitmapChecksum GetChecksum() const;
public:
+void Convert(BmpConversion
