merge conflict stuff

This commit is contained in:
Sebastian
2026-05-04 20:30:16 +02:00
parent d881ef43a3
commit b8438ade34
5 changed files with 17 additions and 49 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ namespace VISEQ::APP::UI{
void AppUI::drawSideBar(){
GuiPanel((Rectangle){-1,-30,380,(float)state->settings.height + 31}, "");
GuiPanel((Rectangle){-1,-30,280,(float)state->settings.height + 31}, "");
const int s_controls = 25;
//GuiSetStyle(BUTTON, STATE_FOCUSED, 0xFF0000FF);
if(GuiButton((Rectangle){20, (float)s_controls, 80, 30}, "PLAY")) sm->play ? sm->pause() : sm->start();