isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-08 10:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

frames: Drop unused border property from frame content

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3608>
This commit is contained in:
Sebastian Keller 2024-02-21 23:56:42 +01:00 committed by Marge Bot
parent f10b3eac62
commit 6876b51875
1 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/frames/meta-frame-content.c
View File

@ -25,14 +25,11 @@ struct _MetaFrameContent
{ {
GtkWidget parent_instance; GtkWidget parent_instance;
Window window; Window window;
GtkBorder border;
gboolean border_initialized;
}; };
enum { enum {
PROP_0, PROP_0,
PROP_XWINDOW, PROP_XWINDOW,
PROP_BORDER,
N_PROPS N_PROPS
}; };
@ -53,9 +50,6 @@ meta_frame_content_set_property (GObject *object,
case PROP_XWINDOW: case PROP_XWINDOW:
frame_content->window = (Window) g_value_get_ulong (value); frame_content->window = (Window) g_value_get_ulong (value);
break; break;
case PROP_BORDER:
frame_content->border = *(GtkBorder*) g_value_get_boxed (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -75,9 +69,6 @@ meta_frame_content_get_property (GObject *object,
case PROP_XWINDOW: case PROP_XWINDOW:
g_value_set_ulong (value, (gulong) frame_content->window); g_value_set_ulong (value, (gulong) frame_content->window);
break; break;
case PROP_BORDER:
g_value_set_boxed (value, &frame_content->border);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -97,50 +88,6 @@ meta_frame_content_measure (GtkWidget *widget,
*minimum = *natural = 1; *minimum = *natural = 1;
} }
static void
meta_frame_content_update_border (MetaFrameContent *content,
GtkBorder border)
{
if (content->border_initialized &&
content->border.left == border.left &&
content->border.right == border.right &&
content->border.top == border.top &&
content->border.bottom == border.bottom)
return;
content->border = border;
content->border_initialized = TRUE;
g_object_notify (G_OBJECT (content), "border");
}
static void
meta_frame_content_size_allocate (GtkWidget *widget,
int width,
int height,
int baseline)
{
MetaFrameContent *content = META_FRAME_CONTENT (widget);
GtkWindow *window = GTK_WINDOW (gtk_widget_get_root (widget));
graphene_point_t point = {};
double scale;
if (!gtk_widget_compute_point (widget,
GTK_WIDGET (window),
&point, &point))
return;
scale = gdk_surface_get_scale_factor (gtk_native_get_surface (GTK_NATIVE (window)));
meta_frame_content_update_border (content,
/* FIXME: right/bottom are broken, if they
* are ever other than 0.
*/
(GtkBorder) {
point.x * scale, 0,
point.y * scale, 0,
});
}
static void static void
meta_frame_content_class_init (MetaFrameContentClass *klass) meta_frame_content_class_init (MetaFrameContentClass *klass)
{ {
@ -151,7 +98,6 @@ meta_frame_content_class_init (MetaFrameContentClass *klass)
object_class->get_property = meta_frame_content_get_property; object_class->get_property = meta_frame_content_get_property;
widget_class->measure = meta_frame_content_measure; widget_class->measure = meta_frame_content_measure;
widget_class->size_allocate = meta_frame_content_size_allocate;
props[PROP_XWINDOW] = g_param_spec_ulong ("xwindow", NULL, NULL, props[PROP_XWINDOW] = g_param_spec_ulong ("xwindow", NULL, NULL,
0, G_MAXULONG, 0, 0, G_MAXULONG, 0,
@ -160,13 +106,6 @@ meta_frame_content_class_init (MetaFrameContentClass *klass)
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB); G_PARAM_STATIC_BLURB);
props[PROP_BORDER] = g_param_spec_boxed ("border", NULL, NULL,
GTK_TYPE_BORDER,
G_PARAM_READABLE |
G_PARAM_EXPLICIT_NOTIFY |
G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB);
g_object_class_install_properties (object_class, g_object_class_install_properties (object_class,
G_N_ELEMENTS (props), G_N_ELEMENTS (props),
@ -191,9 +130,3 @@ meta_frame_content_get_window (MetaFrameContent *content)
{ {
return content->window; return content->window;
} }
GtkBorder
meta_frame_content_get_border (MetaFrameContent *content)
{
return content->border;
}