Commit 653ecab0 authored by Evan W. Patton's avatar Evan W. Patton Committed by Jeffrey Schiller

Fix theme issue due to property/component initialization (#1632)

The change to make component reference blocks usable in globals
changed the ordering of initialization in such a way that components
that rely on the theme applied to Screen1 end up getting the wrong
theme. This corrects the order of initialization so that Screen1's
properties are set immediately before any other components are
created.
parent a4f6c541
......@@ -620,6 +620,10 @@
;; We have to explicity write #!null here, rather than
;; *the-null-value* because that external defintion hasn't happened yet
(add-to-global-vars '*the-null-value* (lambda () #!null))
;; The Form has been created (we're in its code), so we should run
;; do-after-form-creation thunks now. This is important because we
;; need the theme set before creating components.
(for-each force (reverse form-do-after-creation))
(create-components components)
;; These next three clauses need to be in this order:
;; Properties can't be set until after the global variables are
......@@ -627,7 +631,6 @@
;; created: For example, the form's layout can't be changed after the
;; components have been installed. (This gives an error.)
(init-global-variables (reverse global-vars-to-create))
(for-each force (reverse form-do-after-creation))
;; Now that all the components are constructed we can call
;; their init-thunk and their Initialize methods. We need
;; to do this after all the construction steps because the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment