diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-03-07 14:06:21 +0200 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-03-07 14:06:21 +0200 |
commit | ab2e2598cf32348f4bc2d56059c07f404d1e61b7 (patch) | |
tree | b8714975d2e9ff99d83e7b31c29d0d556a724387 /src/ui | |
parent | cd8950953ad6c4361fbc140007ce9cc04fef1e6c (diff) | |
parent | 88baf053cd0e282366a618d9de955ab77063ce10 (diff) |
Merge branch 'dev' of skyjake.fi:skyjake/lagrange into dev
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/widget.c | 3 | ||||
-rw-r--r-- | src/ui/window.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ui/widget.c b/src/ui/widget.c index dca07db2..011f63d7 100644 --- a/src/ui/widget.c +++ b/src/ui/widget.c | |||
@@ -1142,7 +1142,8 @@ static void printTree_Widget_(const iWidget *d, int indent) { | |||
1142 | cstr_String(text_LabelWidget((const iLabelWidget *) d)), | 1142 | cstr_String(text_LabelWidget((const iLabelWidget *) d)), |
1143 | cstr_String(command_LabelWidget((const iLabelWidget *) d))); | 1143 | cstr_String(command_LabelWidget((const iLabelWidget *) d))); |
1144 | } | 1144 | } |
1145 | printf("size:%dx%d flags:%08llx\n", d->rect.size.x, d->rect.size.y, d->flags); | 1145 | printf("size:%dx%d flags:%08llx\n", d->rect.size.x, d->rect.size.y, |
1146 | (long long unsigned int) d->flags); | ||
1146 | iConstForEach(ObjectList, i, d->children) { | 1147 | iConstForEach(ObjectList, i, d->children) { |
1147 | printTree_Widget_(i.object, indent + 1); | 1148 | printTree_Widget_(i.object, indent + 1); |
1148 | } | 1149 | } |
diff --git a/src/ui/window.c b/src/ui/window.c index 19290ee5..038d72af 100644 --- a/src/ui/window.c +++ b/src/ui/window.c | |||
@@ -1833,6 +1833,7 @@ uint32_t frameTime_Window(const iWindow *d) { | |||
1833 | } | 1833 | } |
1834 | 1834 | ||
1835 | iWindow *get_Window(void) { | 1835 | iWindow *get_Window(void) { |
1836 | /* TODO: This should be thread-specific. */ | ||
1836 | return theWindow_; | 1837 | return theWindow_; |
1837 | } | 1838 | } |
1838 | 1839 | ||