isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-24 10:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

2008-02-21 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/x11/clutter-event-x11.c (event_translate): Ignore
	ConfigureNotify events if we are painting on a foreign window.

	* clutter/x11/clutter-stage-x11.c:
	(clutter_stage_x11_request_coords): Reliquish control of the
	window size, if we are painting on a foreign window. This fixes
	the GtkClutterEmbed widget.
This commit is contained in:
Emmanuele Bassi 2008-02-21 12:17:01 +00:00
parent 6e9c4de9ad
commit cbf1b90895
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-02-21 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/x11/clutter-event-x11.c (event_translate): Ignore
ConfigureNotify events if we are painting on a foreign window.
* clutter/x11/clutter-stage-x11.c:
(clutter_stage_x11_request_coords): Reliquish control of the
window size, if we are painting on a foreign window. This fixes
the GtkClutterEmbed widget.
2008-02-20 Emmanuele Bassi <ebassi@openedhand.com> 2008-02-20 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-timeline.c (clutter_timeline_set_delay): Relax * clutter/clutter-timeline.c (clutter_timeline_set_delay): Relax

1
clutter/x11/clutter-event-x11.c
View File

@ -383,6 +383,7 @@ event_translate (ClutterBackend *backend,
switch (xevent->type) switch (xevent->type)
{ {
case ConfigureNotify: case ConfigureNotify:
if (!stage_x11->is_foreign_xwin)
{ {
guint stage_width, stage_height; guint stage_width, stage_height;

6
clutter/x11/clutter-stage-x11.c
View File

@ -179,7 +179,8 @@ clutter_stage_x11_request_coords (ClutterActor *self,
stage_x11->xwin_width = new_width; stage_x11->xwin_width = new_width;
stage_x11->xwin_height = new_height; stage_x11->xwin_height = new_height;
if (stage_x11->xwin != None) if (stage_x11->xwin != None &&
!stage_x11->is_foreign_xwin)
{ {
XResizeWindow (stage_x11->xdpy, XResizeWindow (stage_x11->xdpy,
stage_x11->xwin, stage_x11->xwin,
@ -199,7 +200,8 @@ clutter_stage_x11_request_coords (ClutterActor *self,
CLUTTER_SET_PRIVATE_FLAGS(self, CLUTTER_ACTOR_SYNC_MATRICES); CLUTTER_SET_PRIVATE_FLAGS(self, CLUTTER_ACTOR_SYNC_MATRICES);
} }
if (stage_x11->xwin != None) /* Do we want to bother ? */ if (stage_x11->xwin != None &&
!stage_x11->is_foreign_xwin) /* Do we want to bother ? */
XMoveWindow (stage_x11->xdpy, XMoveWindow (stage_x11->xdpy,
stage_x11->xwin, stage_x11->xwin,
CLUTTER_UNITS_TO_INT (box->x1), CLUTTER_UNITS_TO_INT (box->x1),