isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-23 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "clutter: Mark BinLayout as final"

Browse Source 
This reverts commit 2dca60bd1c9246906a4c793e7c43e3e461a9fd27.

As GNOME Shell subclass that layout manager 3 times in the JS code part

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3509>
This commit is contained in:
Bilal Elmoussaoui 2024-01-10 11:31:13 +01:00
parent 2dca60bd1c
commit 8e04168fb2
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/clutter/clutter-bin-layout.c
View File

@ -54,14 +54,9 @@
#include "clutter/clutter-layout-meta.h" #include "clutter/clutter-layout-meta.h"
#include "clutter/clutter-private.h" #include "clutter/clutter-private.h"
struct _ClutterBinLayout G_DEFINE_TYPE (ClutterBinLayout,
{ clutter_bin_layout,
ClutterLayoutManager parent_instance; CLUTTER_TYPE_LAYOUT_MANAGER)
};
G_DEFINE_FINAL_TYPE (ClutterBinLayout,
clutter_bin_layout,
CLUTTER_TYPE_LAYOUT_MANAGER)
static void static void
clutter_bin_layout_get_preferred_width (ClutterLayoutManager *manager, clutter_bin_layout_get_preferred_width (ClutterLayoutManager *manager,

22
clutter/clutter/clutter-bin-layout.h
View File

@ -35,11 +35,23 @@ G_BEGIN_DECLS
#define CLUTTER_TYPE_BIN_LAYOUT (clutter_bin_layout_get_type ()) #define CLUTTER_TYPE_BIN_LAYOUT (clutter_bin_layout_get_type ())
CLUTTER_EXPORT CLUTTER_EXPORT
G_DECLARE_FINAL_TYPE (ClutterBinLayout, G_DECLARE_DERIVABLE_TYPE (ClutterBinLayout,
clutter_bin_layout, clutter_bin_layout,
CLUTTER, CLUTTER,
CIN_LAYOUT, BIN_LAYOUT,
ClutterLayoutManager) ClutterLayoutManager)
/**
* ClutterBinLayoutClass:
*
* The #ClutterBinLayoutClass structure contains only private
* data and should be accessed using the provided API
*/
struct _ClutterBinLayoutClass
{
/*< private >*/
ClutterLayoutManagerClass parent_class;
};
CLUTTER_EXPORT CLUTTER_EXPORT
ClutterLayoutManager * clutter_bin_layout_new (void); ClutterLayoutManager * clutter_bin_layout_new (void);