Skip to content

Commit 378f370

Browse files
Merge branch 'raysan5:master' into master
2 parents 76de112 + 947ef57 commit 378f370

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

examples/controls_test_suite/controls_test_suite.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,12 @@ int main()
203203
BeginDrawing();
204204

205205
ClearBackground(GetColor(GuiGetStyle(DEFAULT, BACKGROUND_COLOR)));
206-
206+
207207
// raygui: controls drawing
208208
//----------------------------------------------------------------------------------
209209
// Check all possible events that require GuiLock
210210
if (dropDown000EditMode || dropDown001EditMode) GuiLock();
211+
if (showTextInputBox) GuiLock();
211212

212213
// First GUI column
213214
//GuiSetStyle(CHECKBOX, TEXT_ALIGNMENT, TEXT_ALIGN_LEFT);
@@ -236,7 +237,9 @@ int main()
236237
GuiComboBox((Rectangle){ 25, 480, 125, 30 }, "default;Jungle;Lavanda;Dark;Bluish;Cyber;Terminal;Candy;Cherry;Ashes;Enefete;Sunny;Amber", &visualStyleActive);
237238

238239
// NOTE: GuiDropdownBox must draw after any other control that can be covered on unfolding
239-
GuiUnlock();
240+
if (dropDown000EditMode || dropDown001EditMode) GuiUnlock();
241+
if (showTextInputBox) GuiLock(); // Stay locked
242+
240243
GuiSetStyle(DROPDOWNBOX, TEXT_PADDING, 4);
241244
GuiSetStyle(DROPDOWNBOX, TEXT_ALIGNMENT, TEXT_ALIGN_LEFT);
242245
if (GuiDropdownBox((Rectangle){ 25, 65, 125, 30 }, "#01#ONE;#02#TWO;#03#THREE;#04#FOUR", &dropdownBox001Active, dropDown001EditMode)) dropDown001EditMode = !dropDown001EditMode;
@@ -300,6 +303,8 @@ int main()
300303

301304
if (showTextInputBox)
302305
{
306+
GuiUnlock();
307+
303308
DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Fade(RAYWHITE, 0.8f));
304309
int result = GuiTextInputBox((Rectangle){ (float)GetScreenWidth()/2 - 120, (float)GetScreenHeight()/2 - 60, 240, 140 }, GuiIconText(ICON_FILE_SAVE, "Save file as..."), "Introduce output file name:", "Ok;Cancel", textInput, 255, NULL);
305310

0 commit comments

Comments
 (0)