steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui.backend.gtk: tune the order of the setup tasks in (open-window) 

The fix for #1307 made bug #776 come back. Apparently gtk is kind of
britle so the widget setup must be done in a very specific order.
db4
Björn Lindqvist 2015-10-14 00:22:26 +02:00
parent 575da3e478
commit f9e5d4f22c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
basis/ui/backend/gtk/gtk.factor
View File

@ -1,17 +1,15 @@
! Copyright (C) 2010, 2011 Anton Gorenko, Philipp Bruschweiler. ! Copyright (C) 2010, 2011 Anton Gorenko, Philipp Bruschweiler.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors alien.accessors alien.c-types alien.data USING: accessors alien.accessors alien.c-types alien.data
alien.strings arrays assocs classes.struct command-line alien.strings arrays assocs classes.struct combinators continuations
continuations destructors environment gdk.ffi gdk.gl.ffi destructors environment gdk.ffi gdk.gl.ffi gdk.pixbuf.ffi glib.ffi
gdk.pixbuf.ffi glib.ffi gobject-introspection.standard-types gobject-introspection.standard-types gobject.ffi gtk.ffi gtk.gl.ffi
gobject.ffi gtk.ffi gtk.gl.ffi io io.encodings.binary io.encodings.binary io.encodings.utf8 io.files kernel libc literals
io.encodings.utf8 io.files kernel libc literals locals math locals math math.bitwise math.vectors namespaces sequences strings
math.bitwise math.order math.vectors namespaces sequences system threads ui ui.backend ui.backend.gtk.input-methods
strings system threads ui ui.backend ui.backend.gtk.io ui.clipboards ui.event-loop ui.gadgets
ui.backend.gtk.input-methods ui.backend.gtk.io ui.clipboards ui.gadgets.private ui.gadgets.worlds ui.gestures ui.pixel-formats
ui.event-loop ui.gadgets ui.gadgets.private ui.gadgets.worlds ui.pixel-formats.private ui.private vocabs.loader ;
ui.gestures ui.pixel-formats ui.pixel-formats.private ui.private
vocabs.loader combinators ;
IN: ui.backend.gtk IN: ui.backend.gtk
SINGLETON: gtk-ui-backend SINGLETON: gtk-ui-backend
@ -467,13 +465,18 @@ M:: gtk-ui-backend (open-window) ( world -- )
gtk_window_set_wmclass gtk_window_set_wmclass
world configure-gl world configure-gl
! This must be done before realize due to #776.
win events-mask gtk_widget_add_events
win gtk_widget_realize win gtk_widget_realize
! And this must be done after and in this order due to #1307
win im configure-im win im configure-im
win connect-user-input-signals win connect-user-input-signals
win connect-win-state-signals win connect-win-state-signals
win world window-controls>> configure-window-controls
win world window-controls>> configure-window-controls
win gtk_widget_show_all ; win gtk_widget_show_all ;
M: gtk-ui-backend (close-window) ( handle -- ) M: gtk-ui-backend (close-window) ( handle -- )