isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-27 13:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stage] Use min-width/height props for min size

Browse Source 
Instead of shadowing these properties with different properties with the
same names on stage, actually use them. Behaviour should be identical,
except the minimum stage size can now be enforced by setting the
min-width/height properties as well as using the set_minimum_size
function.
This commit is contained in:
Chris Lord 2010-02-26 18:36:38 +00:00
parent 26e22b2ede
commit cd62dfbd14
2 changed files with 77 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clutter/clutter-actor.c
View File

@ -205,6 +205,7 @@
#include "clutter-debug.h"
#include "clutter-units.h"
#include "clutter-profile.h"
#include "clutter-stage.h"
#include "cogl/cogl.h"
typedef struct _ShaderData ShaderData;
@ -5476,12 +5477,14 @@ clutter_actor_set_width_internal (ClutterActor *self,
{
if (width >= 0)
{
clutter_actor_set_min_width (self, width);
if (!CLUTTER_IS_STAGE (self))
clutter_actor_set_min_width (self, width);
clutter_actor_set_natural_width (self, width);
}
else
{
clutter_actor_set_min_width_set (self, FALSE);
if (!CLUTTER_IS_STAGE (self))
clutter_actor_set_min_width_set (self, FALSE);
clutter_actor_set_natural_width_set (self, FALSE);
}
}
@ -5495,12 +5498,14 @@ clutter_actor_set_height_internal (ClutterActor *self,
{
if (height >= 0)
{
clutter_actor_set_min_height (self, height);
if (!CLUTTER_IS_STAGE (self))
clutter_actor_set_min_height (self, height);
clutter_actor_set_natural_height (self, height);
}
else
{
clutter_actor_set_min_height_set (self, FALSE);
if (!CLUTTER_IS_STAGE (self))
clutter_actor_set_min_height_set (self, FALSE);
clutter_actor_set_natural_height_set (self, FALSE);
}
}

102
clutter/clutter-stage.c
View File

@ -82,8 +82,6 @@ struct _ClutterStagePrivate
{
/* the stage implementation */
ClutterStageWindow *impl;
guint minimum_width;
guint minimum_height;
ClutterColor color;
ClutterPerspective perspective;
@ -101,6 +99,7 @@ struct _ClutterStagePrivate
guint use_fog : 1;
guint throttle_motion_events : 1;
guint use_alpha : 1;
guint min_size_changed : 1;
};
enum
@ -216,9 +215,36 @@ clutter_stage_allocate (ClutterActor *self,
klass->allocate (self, box, flags);
/* Ensure the window is sized correctly */
if (!priv->is_fullscreen &&
((geom.width != width) || (geom.height != height)))
_clutter_stage_window_resize (priv->impl, width, height);
if (!priv->is_fullscreen)
{
if (priv->min_size_changed)
{
gfloat min_width, min_height;
gboolean min_width_set, min_height_set;
g_object_get (G_OBJECT (self),
"min-width", &min_width,
"min-width-set", &min_width_set,
"min-height", &min_height,
"min-height-set", &min_height_set,
NULL);
if (!min_width_set)
min_width = 1;
if (!min_height_set)
min_height = 1;
if (width < min_width)
width = min_width;
if (height < min_height)
height = min_height;
priv->min_size_changed = FALSE;
}
if ((geom.width != width) || (geom.height != height))
_clutter_stage_window_resize (priv->impl, width, height);
}
}
else
{
@ -1155,6 +1181,12 @@ clutter_stage_class_init (ClutterStageClass *klass)
g_type_class_add_private (gobject_class, sizeof (ClutterStagePrivate));
}
static void
clutter_stage_notify_min_size (ClutterStage *self)
{
self->priv->min_size_changed = TRUE;
}
static void
clutter_stage_init (ClutterStage *self)
{
@ -1186,10 +1218,9 @@ clutter_stage_init (ClutterStage *self)
priv->is_cursor_visible = TRUE;
priv->use_fog = FALSE;
priv->throttle_motion_events = TRUE;
priv->min_size_changed = FALSE;
priv->color = default_stage_color;
priv->minimum_width = 1;
priv->minimum_height = 1;
priv->perspective.fovy = 60.0; /* 60 Degrees */
priv->perspective.aspect = 1.0;
@ -1203,6 +1234,11 @@ clutter_stage_init (ClutterStage *self)
clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
clutter_stage_set_title (self, g_get_prgname ());
clutter_stage_set_key_focus (self, NULL);
g_signal_connect (self, "notify::min-width",
G_CALLBACK (clutter_stage_notify_min_size), NULL);
g_signal_connect (self, "notify::min-height",
G_CALLBACK (clutter_stage_notify_min_size), NULL);
}
/**
@ -2349,30 +2385,13 @@ clutter_stage_set_minimum_size (ClutterStage *stage,
guint width,
guint height)
{
ClutterGeometry geom;
g_return_if_fail (CLUTTER_IS_STAGE (stage));
g_return_if_fail ((width > 0) && (height > 0));
stage->priv->minimum_width = width;
stage->priv->minimum_height = height;
if (stage->priv->impl == NULL)
return;
_clutter_stage_window_get_geometry (stage->priv->impl, &geom);
if (geom.width > width)
width = geom.width;
if (geom.height > height)
height = geom.height;
/* Call resize to ensure that the minimum size is enforced by
* the backend.
*/
if (CLUTTER_ACTOR_IS_MAPPED (stage))
_clutter_stage_window_resize (stage->priv->impl, width, height);
g_object_set (G_OBJECT (stage),
"min-width", (gfloat)width,
"min-height", (gfloat)height,
NULL);
}
/**
@ -2389,15 +2408,30 @@ clutter_stage_set_minimum_size (ClutterStage *stage,
*/
void
clutter_stage_get_minimum_size (ClutterStage *stage,
guint *width,
guint *height)
guint *width_p,
guint *height_p)
{
gfloat width, height;
gboolean width_set, height_set;
g_return_if_fail (CLUTTER_IS_STAGE (stage));
if (width)
*width = stage->priv->minimum_width;
if (height)
*height = stage->priv->minimum_height;
g_object_get (G_OBJECT (stage),
"min-width", &width,
"min-width-set", &width_set,
"min-height", &height,
"min-height-set", &height_set,
NULL);
if (!width_set)
width = 1;
if (!height_set)
height = 1;
if (width_p)
*width_p = (guint)width;
if (height_p)
*height_p = (guint)height;
}
/* Returns the number of swap buffers pending completion for the stage */