merge conflict stuff
This commit is contained in:
+1
-1
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user