vcl/inc/colorpicker.hxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
New commits: commit 0b839726d4cb3c54741faa66414f0ad119ddc9f3 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Dec 5 16:38:10 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Dec 6 08:42:28 2025 +0100 tdf#169505 Let ColorPickerDialog subclass ColorDialogController Subclass the new abstract class ColorDialogController introduced in previous commit Change-Id: I15900a2bc164c86b74ffe70246b59cb43dcc0543 Author: Michael Weghorn <[email protected]> Date: Fri Dec 5 16:21:37 2025 +0100 tdf#169505 Add abstract ColorDialogController in ColorPickerDialog, which implements LibreOffice's custom color picker. This is another step to prepare for allowing to explicitly switch to the custom color picker instead of using the native GTK and Qt ones again. Change-Id: If0fc4607077254c13c1e02eb5415a23cbcd0fd96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195103 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/inc/colorpicker.hxx b/vcl/inc/colorpicker.hxx index dcc780dfd3ca..45ae44dd468f 100644 --- a/vcl/inc/colorpicker.hxx +++ b/vcl/inc/colorpicker.hxx @@ -159,7 +159,7 @@ private: double mdValue; }; -class ColorPickerDialog : public weld::GenericDialogController +class ColorPickerDialog : public weld::GenericDialogController, public virtual ColorDialogController { private: ColorFieldControl m_aColorField; @@ -204,8 +204,12 @@ private: public: ColorPickerDialog(weld::Window* pParent, const Color& rColor, vcl::ColorPickerMode eDialogMode); - Color GetColor() const; - void SetColor(const Color& rColor); + virtual weld::Dialog* getDialog() override + { + return weld::GenericDialogController::getDialog(); + } + virtual Color GetColor() const override; + virtual void SetColor(const Color& rColor) override; private: void update_color(UpdateFlags n = UpdateFlags::All);
