From 9d25f83e21f33306f5bdbbe4ff672947e6b630ae Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 18 Nov 2025 13:08:45 -0700 Subject: [PATCH] move UIConfigurationBase from libs/widgets to libs/gtkmm2ext --- .../widgets => gtkmm2ext/gtkmm2ext}/ui_config.h | 6 +++--- libs/{widgets => gtkmm2ext}/ui_config.cc | 4 ++-- libs/gtkmm2ext/wscript | 1 + libs/widgets/ardour_button.cc | 3 ++- libs/widgets/ardour_ctrl_base.cc | 2 +- libs/widgets/ardour_fader.cc | 2 +- libs/widgets/ardour_knob.cc | 3 ++- libs/widgets/choice.cc | 3 ++- libs/widgets/fastmeter.cc | 2 +- libs/widgets/frame.cc | 3 ++- libs/widgets/metabutton.cc | 3 ++- libs/widgets/tearoff.cc | 3 ++- libs/widgets/widgets/ardour_spacer.h | 10 +++++----- libs/widgets/wscript | 3 +-- 14 files changed, 27 insertions(+), 21 deletions(-) rename libs/{widgets/widgets => gtkmm2ext/gtkmm2ext}/ui_config.h (93%) rename libs/{widgets => gtkmm2ext}/ui_config.cc (52%) diff --git a/libs/widgets/widgets/ui_config.h b/libs/gtkmm2ext/gtkmm2ext/ui_config.h similarity index 93% rename from libs/widgets/widgets/ui_config.h rename to libs/gtkmm2ext/gtkmm2ext/ui_config.h index 0c753a2b5c..e4f6a3ec77 100644 --- a/libs/widgets/widgets/ui_config.h +++ b/libs/gtkmm2ext/gtkmm2ext/ui_config.h @@ -28,11 +28,11 @@ #include "pbd/configuration.h" #include "gtkmm2ext/colors.h" -#include "widgets/visibility.h" +#include "gtkmm2ext/visibility.h" -namespace ArdourWidgets { +namespace Gtkmm2ext { -class LIBWIDGETS_API UIConfigurationBase : public PBD::Configuration +class LIBGTKMM2EXT_API UIConfigurationBase : public PBD::Configuration { protected: virtual ~UIConfigurationBase() { _instance = 0; } diff --git a/libs/widgets/ui_config.cc b/libs/gtkmm2ext/ui_config.cc similarity index 52% rename from libs/widgets/ui_config.cc rename to libs/gtkmm2ext/ui_config.cc index 0325697ba4..f2ad1d0711 100644 --- a/libs/widgets/ui_config.cc +++ b/libs/gtkmm2ext/ui_config.cc @@ -1,6 +1,6 @@ -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" -namespace ArdourWidgets { +namespace Gtkmm2ext { UIConfigurationBase* UIConfigurationBase::_instance = 0; diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index dd322d339d..446b666b9c 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -42,6 +42,7 @@ gtkmm2ext_sources = [ 'string_completion.cc', 'textviewer.cc', 'treeutils.cc', + 'ui_config.cc', 'utils.cc', 'visibility_tracker.cc', 'window_proxy.cc', diff --git a/libs/widgets/ardour_button.cc b/libs/widgets/ardour_button.cc index acdf4051d1..51e35822ff 100644 --- a/libs/widgets/ardour_button.cc +++ b/libs/widgets/ardour_button.cc @@ -36,13 +36,14 @@ #include "widgets/ardour_button.h" #include "widgets/tooltips.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" #include "pbd/i18n.h" using namespace Gtk; using namespace Glib; using namespace PBD; +using namespace Gtkmm2ext; using namespace ArdourWidgets; using std::max; using std::min; diff --git a/libs/widgets/ardour_ctrl_base.cc b/libs/widgets/ardour_ctrl_base.cc index 303501ac37..21d9f74850 100644 --- a/libs/widgets/ardour_ctrl_base.cc +++ b/libs/widgets/ardour_ctrl_base.cc @@ -34,7 +34,7 @@ #include "gtkmm2ext/utils.h" #include "widgets/ardour_ctrl_base.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" #include "pbd/i18n.h" diff --git a/libs/widgets/ardour_fader.cc b/libs/widgets/ardour_fader.cc index 31cc916e82..6e1280d931 100644 --- a/libs/widgets/ardour_fader.cc +++ b/libs/widgets/ardour_fader.cc @@ -29,7 +29,7 @@ #include "gtkmm2ext/utils.h" #include "widgets/ardour_fader.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" using namespace Gtk; using namespace std; diff --git a/libs/widgets/ardour_knob.cc b/libs/widgets/ardour_knob.cc index 64cef8cb3b..d73d59e624 100644 --- a/libs/widgets/ardour_knob.cc +++ b/libs/widgets/ardour_knob.cc @@ -27,11 +27,12 @@ #include "gtkmm2ext/utils.h" #include "widgets/ardour_knob.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" #include "pbd/i18n.h" using namespace ArdourWidgets; +using namespace Gtkmm2ext; using namespace PBD; ArdourKnob::Element ArdourKnob::default_elements = ArdourKnob::Element (ArdourKnob::Arc); diff --git a/libs/widgets/choice.cc b/libs/widgets/choice.cc index 9f2147459d..de423898e7 100644 --- a/libs/widgets/choice.cc +++ b/libs/widgets/choice.cc @@ -20,11 +20,12 @@ #include #include "widgets/choice.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" using namespace std; using namespace sigc; using namespace Gtk; +using namespace Gtkmm2ext; using namespace ArdourWidgets; Choice::Choice (string title, string prompt, vector choices, bool center) diff --git a/libs/widgets/fastmeter.cc b/libs/widgets/fastmeter.cc index 050de04f29..bea228b84a 100644 --- a/libs/widgets/fastmeter.cc +++ b/libs/widgets/fastmeter.cc @@ -29,7 +29,7 @@ #include "gtkmm2ext/utils.h" #include "widgets/fastmeter.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" #define UINT_TO_RGB(u,r,g,b) { (*(r)) = ((u)>>16)&0xff; (*(g)) = ((u)>>8)&0xff; (*(b)) = (u)&0xff; } diff --git a/libs/widgets/frame.cc b/libs/widgets/frame.cc index edc0b4a5d3..19e9091988 100644 --- a/libs/widgets/frame.cc +++ b/libs/widgets/frame.cc @@ -22,10 +22,11 @@ #include "gtkmm2ext/utils.h" #include "widgets/frame.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" using namespace std; using namespace Gtk; +using namespace Gtkmm2ext; using namespace ArdourWidgets; Frame::Frame (Orientation orientation, bool boxy) diff --git a/libs/widgets/metabutton.cc b/libs/widgets/metabutton.cc index 12c74e2385..de8266c4bb 100644 --- a/libs/widgets/metabutton.cc +++ b/libs/widgets/metabutton.cc @@ -21,7 +21,7 @@ #include "pbd/unwind.h" #include "widgets/metabutton.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" using namespace Gtk; using namespace std; @@ -245,6 +245,7 @@ MetaButton::set_index (guint index) void MetaButton::render (Cairo::RefPtr const& ctx, cairo_rectangle_t* rect) { + using namespace Gtkmm2ext; { PBD::Unwinder uw (_hovering, false); ArdourButton::render (ctx, rect); diff --git a/libs/widgets/tearoff.cc b/libs/widgets/tearoff.cc index 5ebbe3c3fe..fe2c2981a7 100644 --- a/libs/widgets/tearoff.cc +++ b/libs/widgets/tearoff.cc @@ -25,7 +25,7 @@ #include "gtkmm2ext/utils.h" #include "widgets/tearoff.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" #include "pbd/i18n.h" @@ -33,6 +33,7 @@ using namespace std; using namespace Glib; using namespace Gdk; using namespace Gtk; +using namespace Gtkmm2ext; using namespace ArdourWidgets; TearOff::TearOff (Widget& c, bool allow_resize) diff --git a/libs/widgets/widgets/ardour_spacer.h b/libs/widgets/widgets/ardour_spacer.h index cf8a03368a..a9bce814a6 100644 --- a/libs/widgets/widgets/ardour_spacer.h +++ b/libs/widgets/widgets/ardour_spacer.h @@ -23,7 +23,7 @@ #include "gtkmm2ext/cairo_widget.h" #include "gtkmm2ext/colors.h" -#include "widgets/ui_config.h" +#include "gtkmm2ext/ui_config.h" #include "widgets/visibility.h" @@ -39,10 +39,10 @@ protected: void on_size_request (Gtk::Requisition* req) { if (_natural_width > 0) { - req->width = _natural_width * UIConfigurationBase::instance().get_ui_scale (); + req->width = _natural_width * Gtkmm2ext::UIConfigurationBase::instance().get_ui_scale (); } if (_natural_height > 0) { - req->height = _natural_height * UIConfigurationBase::instance().get_ui_scale (); + req->height = _natural_height * Gtkmm2ext::UIConfigurationBase::instance().get_ui_scale (); } CairoWidget::on_size_request (req); } @@ -69,7 +69,7 @@ protected: float h = height * _ratio; float t = .5f * (height - h); ctx->rectangle (0, t, 1, h); - uint32_t c = UIConfigurationBase::instance().color ("neutral:backgroundest"); + uint32_t c = Gtkmm2ext::UIConfigurationBase::instance().color ("neutral:backgroundest"); Gtkmm2ext::set_source_rgba (ctx, c); ctx->fill (); } @@ -101,7 +101,7 @@ protected: float w = width * _ratio; float t = .5f * (width - w); ctx->rectangle (t, 0, w, 1); - uint32_t c = UIConfigurationBase::instance().color ("neutral:backgroundest"); + uint32_t c = Gtkmm2ext::UIConfigurationBase::instance().color ("neutral:backgroundest"); Gtkmm2ext::set_source_rgba (ctx, c); ctx->fill (); } diff --git a/libs/widgets/wscript b/libs/widgets/wscript index 2a447f6777..711641c605 100644 --- a/libs/widgets/wscript +++ b/libs/widgets/wscript @@ -44,8 +44,7 @@ widgets_sources = [ 'stateful_button.cc', 'tabbable.cc', 'tearoff.cc', - 'tooltips.cc', - 'ui_config.cc', + 'tooltips.cc' ] def options(opt):