iconGrid: Subclass a C actor for BaseIcon
We create a lot of BaseIcons for the appGrid, one for every app, and for all of those we have to hop through JS to get the preferred width. That makes it another obvious target for moving to C, so let's do that. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1755>
This commit is contained in:
@ -105,6 +105,7 @@ libshell_public_headers = [
|
||||
'shell-mount-operation.h',
|
||||
'shell-perf-log.h',
|
||||
'shell-screenshot.h',
|
||||
'shell-square-bin.h',
|
||||
'shell-stack.h',
|
||||
'shell-tray-icon.h',
|
||||
'shell-tray-manager.h',
|
||||
@ -149,6 +150,7 @@ libshell_sources = [
|
||||
'shell-screenshot.c',
|
||||
'shell-secure-text-buffer.c',
|
||||
'shell-secure-text-buffer.h',
|
||||
'shell-square-bin.c',
|
||||
'shell-stack.c',
|
||||
'shell-tray-icon.c',
|
||||
'shell-tray-manager.c',
|
||||
|
43
src/shell-square-bin.c
Normal file
43
src/shell-square-bin.c
Normal file
@ -0,0 +1,43 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "shell-square-bin.h"
|
||||
|
||||
struct _ShellSquareBin
|
||||
{
|
||||
/*< private >*/
|
||||
StBin parent_instance;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (ShellSquareBin, shell_square_bin, ST_TYPE_BIN);
|
||||
|
||||
static void
|
||||
shell_square_bin_get_preferred_width (ClutterActor *actor,
|
||||
float for_height,
|
||||
float *min_width_p,
|
||||
float *natural_width_p)
|
||||
{
|
||||
float min_width, nat_width;
|
||||
|
||||
/* Return the actual height to keep the squared aspect */
|
||||
clutter_actor_get_preferred_height (actor, -1,
|
||||
&min_width, &nat_width);
|
||||
|
||||
if (min_width_p)
|
||||
*min_width_p = min_width;
|
||||
|
||||
if (natural_width_p)
|
||||
*natural_width_p = nat_width;
|
||||
}
|
||||
|
||||
static void
|
||||
shell_square_bin_init (ShellSquareBin *self)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
shell_square_bin_class_init (ShellSquareBinClass *klass)
|
||||
{
|
||||
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
|
||||
|
||||
actor_class->get_preferred_width = shell_square_bin_get_preferred_width;
|
||||
}
|
13
src/shell-square-bin.h
Normal file
13
src/shell-square-bin.h
Normal file
@ -0,0 +1,13 @@
|
||||
#ifndef __SHELL_SQUARE_BIN_H__
|
||||
#define __SHELL_SQUARE_BIN_H__
|
||||
|
||||
#include <st/st.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define SHELL_TYPE_SQUARE_BIN (shell_square_bin_get_type ())
|
||||
G_DECLARE_FINAL_TYPE (ShellSquareBin, shell_square_bin, SHELL, SquareBin, StBin)
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __SHELL_SQUARE_BIN_H__ */
|
Reference in New Issue
Block a user