From b26faf1b13026a19b2d3bc7637eac69d8ca2a541 Mon Sep 17 00:00:00 2001 From: Anton Lazarev Date: Wed, 13 Dec 2023 10:55:07 -0800 Subject: [PATCH] calls-new-call-box: compose with GtkBin instead of subclassing GtkBox Part-of: --- src/calls-new-call-box.c | 4 +- src/calls-new-call-box.h | 2 +- src/ui/new-call-box.ui | 127 ++++++++++++++++++++------------------- 3 files changed, 69 insertions(+), 64 deletions(-) diff --git a/src/calls-new-call-box.c b/src/calls-new-call-box.c index ea12ccc..5a13b2a 100644 --- a/src/calls-new-call-box.c +++ b/src/calls-new-call-box.c @@ -44,7 +44,7 @@ enum { static GParamSpec *props[PROP_LAST_PROP]; struct _CallsNewCallBox { - GtkBox parent_instance; + GtkBin parent_instance; GtkListBox *origin_list_box; HdyComboRow *origin_list; @@ -58,7 +58,7 @@ struct _CallsNewCallBox { gboolean numeric_input_only; }; -G_DEFINE_TYPE (CallsNewCallBox, calls_new_call_box, GTK_TYPE_BOX); +G_DEFINE_TYPE (CallsNewCallBox, calls_new_call_box, GTK_TYPE_BIN); static CallsOrigin * diff --git a/src/calls-new-call-box.h b/src/calls-new-call-box.h index adc8891..c384bbf 100644 --- a/src/calls-new-call-box.h +++ b/src/calls-new-call-box.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS #define CALLS_TYPE_NEW_CALL_BOX (calls_new_call_box_get_type ()) -G_DECLARE_FINAL_TYPE (CallsNewCallBox, calls_new_call_box, CALLS, NEW_CALL_BOX, GtkBox) +G_DECLARE_FINAL_TYPE (CallsNewCallBox, calls_new_call_box, CALLS, NEW_CALL_BOX, GtkBin) CallsNewCallBox *calls_new_call_box_new (void); void calls_new_call_box_dial (CallsNewCallBox *self, diff --git a/src/ui/new-call-box.ui b/src/ui/new-call-box.ui index 560eeda..989877f 100644 --- a/src/ui/new-call-box.ui +++ b/src/ui/new-call-box.ui @@ -3,82 +3,87 @@ -