Browse Source

small fix to stages

pull/1/head
Leonard Ritter 10 years ago
parent
commit
d8f7e65c53
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      oui.h

+ 2
- 4
oui.h View File

@@ -815,7 +815,6 @@ typedef enum UIstate {


typedef enum UIstage { typedef enum UIstage {
UI_STAGE_DECLARE = 0, UI_STAGE_DECLARE = 0,
UI_STAGE_DRAW,
UI_STAGE_PROCESS, UI_STAGE_PROCESS,
} UIstage; } UIstage;


@@ -1618,7 +1617,7 @@ void uiLayout() {
uiUpdateHotItem(); uiUpdateHotItem();
} }


ui_context->stage = UI_STAGE_DRAW;
ui_context->stage = UI_STAGE_PROCESS;
} }


UIrect uiGetRect(int item) { UIrect uiGetRect(int item) {
@@ -1740,8 +1739,7 @@ int uiGetClicks() {
void uiProcess(int timestamp) { void uiProcess(int timestamp) {
assert(ui_context); assert(ui_context);


assert(ui_context->stage == UI_STAGE_DRAW); // must run uiClear(), uiLayout() first
ui_context->stage = UI_STAGE_PROCESS;
assert(ui_context->stage == UI_STAGE_PROCESS); // must run uiClear(), uiLayout() first


if (!ui_context->count) { if (!ui_context->count) {
uiClearInputEvents(); uiClearInputEvents();


Loading…
Cancel
Save