1.2.0.beta.11.2.0.beta.1

1 files changed, 89 insertions, 91 deletions

diff --git a/demo/imgui.cpp b/demo/imgui.cpp
index bc42082..cccaf3f 100644
--- a/demo/imgui.cpp
+++ b/demo/imgui.cpp
@@ -33,10 +33,10 @@ static char g_textPool[TEXT_POOL_SIZE];
 static unsigned g_textPoolSize = 0;
 static const char* allocText(const char* text)
 {
-	int len = (int)(strlen(text)+1);
+	int len = (int)(strlen(text) + 1);
 	if (g_textPoolSize + len >= TEXT_POOL_SIZE)
 		return 0;
-	char* dst = &g_textPool[g_textPoolSize]; 
+	char* dst = &g_textPool[g_textPoolSize];
 	memcpy(dst, text, len);
 	g_textPoolSize += len;
 	return dst;
@@ -147,13 +147,13 @@ struct GuiState
 		mx(-1), my(-1), scroll(0),
 		active(0), hot(0), hotToBe(0), isHot(false), isActive(false), wentActive(false),
 		dragX(0), dragY(0), dragOrig(0), widgetX(0), widgetY(0), widgetW(100),
-		insideCurrentScroll(false),  areaId(0), widgetId(0)
+		insideCurrentScroll(false), areaId(0), widgetId(0)
 	{
 	}
 
 	bool left;
 	bool leftPressed, leftReleased;
-	int mx,my;
+	int mx, my;
 	int scroll;
 	unsigned int active;
 	unsigned int hot;
@@ -165,7 +165,7 @@ struct GuiState
 	float dragOrig;
 	int widgetX, widgetY, widgetW;
 	bool insideCurrentScroll;
-	
+
 	unsigned int areaId;
 	unsigned int widgetId;
 };
@@ -198,7 +198,7 @@ inline bool isHot(unsigned int id)
 
 inline bool inRect(int x, int y, int w, int h, bool checkScroll = true)
 {
-   return (!checkScroll || g_state.insideCurrentScroll) && g_state.mx >= x && g_state.mx <= x+w && g_state.my >= y && g_state.my <= y+h;
+	return (!checkScroll || g_state.insideCurrentScroll) && g_state.mx >= x && g_state.mx <= x + w && g_state.my >= y && g_state.my <= y + h;
 }
 
 inline void clearInput()
@@ -223,12 +223,12 @@ inline void setActive(unsigned int id)
 
 inline void setHot(unsigned int id)
 {
-   g_state.hotToBe = id;
-// Begin Add Android Support
+	g_state.hotToBe = id;
+	// Begin Add Android Support
 #ifdef ANDROID
-   g_state.hot = id;
+	g_state.hot = id;
 #endif
-// End Add Android Support
+	// End Add Android Support
 }
 
 
@@ -240,7 +240,7 @@ static bool buttonLogic(unsigned int id, bool over)
 	{
 		if (over)
 			setHot(id);
-// Begin Add Android Support
+		// Begin Add Android Support
 #ifdef ANDROID
 		if (isHot(id) && g_state.leftPressed && over)
 			setActive(id);
@@ -248,7 +248,7 @@ static bool buttonLogic(unsigned int id, bool over)
 		if (isHot(id) && g_state.leftPressed)
 			setActive(id);
 #endif
-// End Add Android Support
+		// End Add Android Support
 	}
 
 	// if button is active, then react on left up
@@ -286,7 +286,7 @@ static void updateInput(int mx, int my, unsigned char mbut, int scroll)
 
 void imguiBeginFrame(int mx, int my, unsigned char mbut, int scroll)
 {
-	updateInput(mx,my,mbut,scroll);
+	updateInput(mx, my, mbut, scroll);
 
 	g_state.hot = g_state.hotToBe;
 	g_state.hotToBe = 0;
@@ -346,29 +346,29 @@ bool imguiBeginScrollArea(const char* name, int x, int y, int w, int h, int* scr
 {
 	g_state.areaId++;
 	g_state.widgetId = 0;
-	g_scrollId = (g_state.areaId<<16) | g_state.widgetId;
+	g_scrollId = (g_state.areaId << 16) | g_state.widgetId;
 
 	g_state.widgetX = x + SCROLL_AREA_PADDING;
-	g_state.widgetY = y+h-AREA_HEADER + (*scroll);
-	g_state.widgetW = w - SCROLL_AREA_PADDING*4;
-	g_scrollTop = y-AREA_HEADER+h;
-	g_scrollBottom = y+SCROLL_AREA_PADDING;
-	g_scrollRight = x+w - SCROLL_AREA_PADDING*3;
+	g_state.widgetY = y + h - AREA_HEADER + (*scroll);
+	g_state.widgetW = w - SCROLL_AREA_PADDING * 4;
+	g_scrollTop = y - AREA_HEADER + h;
+	g_scrollBottom = y + SCROLL_AREA_PADDING;
+	g_scrollRight = x + w - SCROLL_AREA_PADDING * 3;
 	g_scrollVal = scroll;
 
 	g_scrollAreaTop = g_state.widgetY;
 
-	g_focusTop = y-AREA_HEADER;
-	g_focusBottom = y-AREA_HEADER+h;
+	g_focusTop = y - AREA_HEADER;
+	g_focusBottom = y - AREA_HEADER + h;
 
 	g_insideScrollArea = inRect(x, y, w, h, false);
 	g_state.insideCurrentScroll = g_insideScrollArea;
 
-	addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, 6, imguiRGBA(0,0,0,192));
+	addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, 6, imguiRGBA(0, 0, 0, 192));
 
-	addGfxCmdText(x+AREA_HEADER/2, y+h-AREA_HEADER/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, name, imguiRGBA(255,255,255,128));
+	addGfxCmdText(x + AREA_HEADER / 2, y + h - AREA_HEADER / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, name, imguiRGBA(255, 255, 255, 128));
 
-	addGfxCmdScissor(x+SCROLL_AREA_PADDING, y+SCROLL_AREA_PADDING, w-SCROLL_AREA_PADDING*4, h-AREA_HEADER-SCROLL_AREA_PADDING);
+	addGfxCmdScissor(x + SCROLL_AREA_PADDING, y + SCROLL_AREA_PADDING, w - SCROLL_AREA_PADDING * 4, h - AREA_HEADER - SCROLL_AREA_PADDING);
 
 	return g_insideScrollArea;
 }
@@ -376,39 +376,39 @@ bool imguiBeginScrollArea(const char* name, int x, int y, int w, int h, int* scr
 void imguiEndScrollArea()
 {
 	// Disable scissoring.
-	addGfxCmdScissor(-1,-1,-1,-1);
+	addGfxCmdScissor(-1, -1, -1, -1);
 
 	// Draw scroll bar
-	int x = g_scrollRight+SCROLL_AREA_PADDING/2;
+	int x = g_scrollRight + SCROLL_AREA_PADDING / 2;
 	int y = g_scrollBottom;
-	int w = SCROLL_AREA_PADDING*2;
+	int w = SCROLL_AREA_PADDING * 2;
 	int h = g_scrollTop - g_scrollBottom;
 
 	int stop = g_scrollAreaTop;
 	int sbot = g_state.widgetY;
 	int sh = stop - sbot; // The scrollable area height.
 
-	float barHeight = (float)h/(float)sh;
-	
+	float barHeight = (float)h / (float)sh;
+
 	if (barHeight < 1)
 	{
-		float barY = (float)(y - sbot)/(float)sh;
+		float barY = (float)(y - sbot) / (float)sh;
 		if (barY < 0) barY = 0;
 		if (barY > 1) barY = 1;
-		
+
 		// Handle scroll bar logic.
 		unsigned int hid = g_scrollId;
 		int hx = x;
 		int hy = y + (int)(barY*h);
 		int hw = w;
 		int hh = (int)(barHeight*h);
-		
-		const int range = h - (hh-1);
+
+		const int range = h - (hh - 1);
 		bool over = inRect(hx, hy, hw, hh);
 		buttonLogic(hid, over);
 		if (isActive(hid))
 		{
-			float u = (float)(hy-y) / (float)range;
+			float u = (float)(hy - y) / (float)range;
 			if (g_state.wentActive)
 			{
 				g_state.dragY = g_state.my;
@@ -419,26 +419,26 @@ void imguiEndScrollArea()
 				u = g_state.dragOrig + (g_state.my - g_state.dragY) / (float)range;
 				if (u < 0) u = 0;
 				if (u > 1) u = 1;
-				*g_scrollVal = (int)((1-u) * (sh - h));
+				*g_scrollVal = (int)((1 - u) * (sh - h));
 			}
 		}
-		
+
 		// BG
-		addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, (float)w/2-1, imguiRGBA(0,0,0,196));
+		addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, (float)w / 2 - 1, imguiRGBA(0, 0, 0, 196));
 		// Bar
 		if (isActive(hid))
-			addGfxCmdRoundedRect((float)hx, (float)hy, (float)hw, (float)hh, (float)w/2-1, imguiRGBA(255,196,0,196));
+			addGfxCmdRoundedRect((float)hx, (float)hy, (float)hw, (float)hh, (float)w / 2 - 1, imguiRGBA(255, 196, 0, 196));
 		else
-			addGfxCmdRoundedRect((float)hx, (float)hy, (float)hw, (float)hh, (float)w/2-1, isHot(hid) ? imguiRGBA(255,196,0,96) : imguiRGBA(255,255,255,64));
+			addGfxCmdRoundedRect((float)hx, (float)hy, (float)hw, (float)hh, (float)w / 2 - 1, isHot(hid) ? imguiRGBA(255, 196, 0, 96) : imguiRGBA(255, 255, 255, 64));
 
 		// Handle mouse scrolling.
 		if (g_insideScrollArea) // && !anyActive())
 		{
 			if (g_state.scroll)
 			{
-				*g_scrollVal += 20*g_state.scroll;
+				*g_scrollVal += 20 * g_state.scroll;
 				if (*g_scrollVal < 0) *g_scrollVal = 0;
-				if (*g_scrollVal > (sh - h)) *g_scrollVal = (sh - h);
+				if (*g_scrollVal >(sh - h)) *g_scrollVal = (sh - h);
 			}
 		}
 	}
@@ -448,8 +448,8 @@ void imguiEndScrollArea()
 bool imguiButton(const char* text, bool enabled)
 {
 	g_state.widgetId++;
-	unsigned int id = (g_state.areaId<<16) | g_state.widgetId;
-	
+	unsigned int id = (g_state.areaId << 16) | g_state.widgetId;
+
 	int x = g_state.widgetX;
 	int y = g_state.widgetY - BUTTON_HEIGHT;
 	int w = g_state.widgetW;
@@ -459,16 +459,16 @@ bool imguiButton(const char* text, bool enabled)
 	bool over = enabled && inRect(x, y, w, h);
 	bool res = buttonLogic(id, over);
 
-	addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, (float)BUTTON_HEIGHT/2-1, imguiRGBA(128,128,128, isActive(id)?196:96));
+	addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, (float)BUTTON_HEIGHT / 2 - 1, imguiRGBA(128, 128, 128, isActive(id) ? 196 : 96));
 	if (enabled)
-		addGfxCmdText(x+BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
+		addGfxCmdText(x + BUTTON_HEIGHT / 2, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200));
 	else
-		addGfxCmdText(x+BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128,128,128,200));
+		addGfxCmdText(x + BUTTON_HEIGHT / 2, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128, 128, 128, 200));
 
 	return res;
 }
 
-bool imguiItem(const char* text, bool enabled, unsigned int color, bool forceHot)
+bool imguiItem(const char* text, bool enabled, unsigned int color)
 {
 	g_state.widgetId++;
 	unsigned int id = (g_state.areaId << 16) | g_state.widgetId;
@@ -484,8 +484,6 @@ bool imguiItem(const char* text, bool enabled, unsigned int color, bool forceHot
 
 	if (isHot(id))
 		addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, 2.0f, imguiRGBA(255, 196, 0, isActive(id) ? 196 : 96));
-	else if (forceHot)
-		addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, 2.0f, imguiRGBA(128, 128, 128, 96));
 
 	if (enabled)
 		addGfxCmdText(x + BUTTON_HEIGHT / 2, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, color);
@@ -498,8 +496,8 @@ bool imguiItem(const char* text, bool enabled, unsigned int color, bool forceHot
 bool imguiCheck(const char* text, bool checked, bool enabled)
 {
 	g_state.widgetId++;
-	unsigned int id = (g_state.areaId<<16) | g_state.widgetId;
-	
+	unsigned int id = (g_state.areaId << 16) | g_state.widgetId;
+
 	int x = g_state.widgetX;
 	int y = g_state.widgetY - BUTTON_HEIGHT;
 	int w = g_state.widgetW;
@@ -508,22 +506,22 @@ bool imguiCheck(const char* text, bool checked, bool enabled)
 
 	bool over = enabled && inRect(x, y, w, h);
 	bool res = buttonLogic(id, over);
-	
-	const int cx = x+BUTTON_HEIGHT/2-CHECK_SIZE/2;
-	const int cy = y+BUTTON_HEIGHT/2-CHECK_SIZE/2;
-	addGfxCmdRoundedRect((float)cx-3, (float)cy-3, (float)CHECK_SIZE+6, (float)CHECK_SIZE+6, 4, imguiRGBA(128,128,128, isActive(id)?196:96));
+
+	const int cx = x + BUTTON_HEIGHT / 2 - CHECK_SIZE / 2;
+	const int cy = y + BUTTON_HEIGHT / 2 - CHECK_SIZE / 2;
+	addGfxCmdRoundedRect((float)cx - 3, (float)cy - 3, (float)CHECK_SIZE + 6, (float)CHECK_SIZE + 6, 4, imguiRGBA(128, 128, 128, isActive(id) ? 196 : 96));
 	if (checked)
 	{
 		if (enabled)
-			addGfxCmdRoundedRect((float)cx, (float)cy, (float)CHECK_SIZE, (float)CHECK_SIZE, (float)CHECK_SIZE/2-1, imguiRGBA(255,255,255,isActive(id)?255:200));
+			addGfxCmdRoundedRect((float)cx, (float)cy, (float)CHECK_SIZE, (float)CHECK_SIZE, (float)CHECK_SIZE / 2 - 1, imguiRGBA(255, 255, 255, isActive(id) ? 255 : 200));
 		else
-			addGfxCmdRoundedRect((float)cx, (float)cy, (float)CHECK_SIZE, (float)CHECK_SIZE, (float)CHECK_SIZE/2-1, imguiRGBA(128,128,128,200));
+			addGfxCmdRoundedRect((float)cx, (float)cy, (float)CHECK_SIZE, (float)CHECK_SIZE, (float)CHECK_SIZE / 2 - 1, imguiRGBA(128, 128, 128, 200));
 	}
 
 	if (enabled)
-		addGfxCmdText(x+BUTTON_HEIGHT, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
+		addGfxCmdText(x + BUTTON_HEIGHT, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200));
 	else
-		addGfxCmdText(x+BUTTON_HEIGHT, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128,128,128,200));
+		addGfxCmdText(x + BUTTON_HEIGHT, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128, 128, 128, 200));
 
 	return res;
 }
@@ -531,33 +529,33 @@ bool imguiCheck(const char* text, bool checked, bool enabled)
 bool imguiCollapse(const char* text, const char* subtext, bool checked, bool enabled)
 {
 	g_state.widgetId++;
-	unsigned int id = (g_state.areaId<<16) | g_state.widgetId;
-	
+	unsigned int id = (g_state.areaId << 16) | g_state.widgetId;
+
 	int x = g_state.widgetX;
 	int y = g_state.widgetY - BUTTON_HEIGHT;
 	int w = g_state.widgetW;
 	int h = BUTTON_HEIGHT;
 	g_state.widgetY -= BUTTON_HEIGHT; // + DEFAULT_SPACING;
 
-	const int cx = x+BUTTON_HEIGHT/2-CHECK_SIZE/2;
-	const int cy = y+BUTTON_HEIGHT/2-CHECK_SIZE/2;
+	const int cx = x + BUTTON_HEIGHT / 2 - CHECK_SIZE / 2;
+	const int cy = y + BUTTON_HEIGHT / 2 - CHECK_SIZE / 2;
 
 	bool over = enabled && inRect(x, y, w, h);
 	bool res = buttonLogic(id, over);
-	
+
 	if (checked)
-		addGfxCmdTriangle(cx, cy, CHECK_SIZE, CHECK_SIZE, 2, imguiRGBA(255,255,255,isActive(id)?255:200));
+		addGfxCmdTriangle(cx, cy, CHECK_SIZE, CHECK_SIZE, 2, imguiRGBA(255, 255, 255, isActive(id) ? 255 : 200));
 	else
-		addGfxCmdTriangle(cx, cy, CHECK_SIZE, CHECK_SIZE, 1, imguiRGBA(255,255,255,isActive(id)?255:200));
+		addGfxCmdTriangle(cx, cy, CHECK_SIZE, CHECK_SIZE, 1, imguiRGBA(255, 255, 255, isActive(id) ? 255 : 200));
 
 	if (enabled)
-		addGfxCmdText(x+BUTTON_HEIGHT, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
+		addGfxCmdText(x + BUTTON_HEIGHT, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200));
 	else
-		addGfxCmdText(x+BUTTON_HEIGHT, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128,128,128,200));
+		addGfxCmdText(x + BUTTON_HEIGHT, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128, 128, 128, 200));
 
 	if (subtext)
-		addGfxCmdText(x+w-BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_RIGHT, subtext, imguiRGBA(255,255,255,128));
-	
+		addGfxCmdText(x + w - BUTTON_HEIGHT / 2, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_RIGHT, subtext, imguiRGBA(255, 255, 255, 128));
+
 	return res;
 }
 
@@ -566,7 +564,7 @@ void imguiLabel(const char* text)
 	int x = g_state.widgetX;
 	int y = g_state.widgetY - BUTTON_HEIGHT;
 	g_state.widgetY -= BUTTON_HEIGHT;
-	addGfxCmdText(x, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(255,255,255,255));
+	addGfxCmdText(x, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, imguiRGBA(255, 255, 255, 255));
 }
 
 void imguiValue(const char* text)
@@ -575,31 +573,31 @@ void imguiValue(const char* text)
 	const int y = g_state.widgetY - BUTTON_HEIGHT;
 	const int w = g_state.widgetW;
 	g_state.widgetY -= BUTTON_HEIGHT;
-	
-	addGfxCmdText(x+w-BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_RIGHT, text, imguiRGBA(255,255,255,200));
+
+	addGfxCmdText(x + w - BUTTON_HEIGHT / 2, y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_RIGHT, text, imguiRGBA(255, 255, 255, 200));
 }
 
 bool imguiSlider(const char* text, float* val, float vmin, float vmax, float vinc, bool enabled)
 {
 	g_state.widgetId++;
-	unsigned int id = (g_state.areaId<<16) | g_state.widgetId;
-	
+	unsigned int id = (g_state.areaId << 16) | g_state.widgetId;
+
 	int x = g_state.widgetX;
 	int y = g_state.widgetY - BUTTON_HEIGHT;
 	int w = g_state.widgetW;
 	int h = SLIDER_HEIGHT;
 	g_state.widgetY -= SLIDER_HEIGHT + DEFAULT_SPACING;
 
-	addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, 4.0f, imguiRGBA(0,0,0,128));
+	addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, 4.0f, imguiRGBA(0, 0, 0, 128));
 
 	const int range = w - SLIDER_MARKER_WIDTH;
 
-	float u = (*val - vmin) / (vmax-vmin);
+	float u = (*val - vmin) / (vmax - vmin);
 	if (u < 0) u = 0;
 	if (u > 1) u = 1;
 	int m = (int)(u * range);
 
-	bool over = enabled && inRect(x+m, y, SLIDER_MARKER_WIDTH, SLIDER_HEIGHT);
+	bool over = enabled && inRect(x + m, y, SLIDER_MARKER_WIDTH, SLIDER_HEIGHT);
 	bool res = buttonLogic(id, over);
 	bool valChanged = false;
 
@@ -615,17 +613,17 @@ bool imguiSlider(const char* text, float* val, float vmin, float vmax, float vin
 			u = g_state.dragOrig + (float)(g_state.mx - g_state.dragX) / (float)range;
 			if (u < 0) u = 0;
 			if (u > 1) u = 1;
-			*val = vmin + u*(vmax-vmin);
-			*val = floorf(*val/vinc+0.5f)*vinc; // Snap to vinc
+			*val = vmin + u*(vmax - vmin);
+			*val = floorf(*val / vinc + 0.5f)*vinc; // Snap to vinc
 			m = (int)(u * range);
 			valChanged = true;
 		}
 	}
 
 	if (isActive(id))
-		addGfxCmdRoundedRect((float)(x+m), (float)y, (float)SLIDER_MARKER_WIDTH, (float)SLIDER_HEIGHT, 4.0f, imguiRGBA(255,255,255,255));
+		addGfxCmdRoundedRect((float)(x + m), (float)y, (float)SLIDER_MARKER_WIDTH, (float)SLIDER_HEIGHT, 4.0f, imguiRGBA(255, 255, 255, 255));
 	else
-		addGfxCmdRoundedRect((float)(x+m), (float)y, (float)SLIDER_MARKER_WIDTH, (float)SLIDER_HEIGHT, 4.0f, isHot(id) ? imguiRGBA(255,196,0,128) : imguiRGBA(255,255,255,64));
+		addGfxCmdRoundedRect((float)(x + m), (float)y, (float)SLIDER_MARKER_WIDTH, (float)SLIDER_HEIGHT, 4.0f, isHot(id) ? imguiRGBA(255, 196, 0, 128) : imguiRGBA(255, 255, 255, 64));
 
 	// TODO: fix this, take a look at 'nicenum'.
 	int digits = (int)(ceilf(log10f(vinc)));
@@ -633,16 +631,16 @@ bool imguiSlider(const char* text, float* val, float vmin, float vmax, float vin
 	snprintf(fmt, 16, "%%.%df", digits >= 0 ? 0 : -digits);
 	char msg[128];
 	snprintf(msg, 128, fmt, *val);
-	
+
 	if (enabled)
 	{
-		addGfxCmdText(x+SLIDER_HEIGHT/2, y+SLIDER_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
-		addGfxCmdText(x+w-SLIDER_HEIGHT/2, y+SLIDER_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_RIGHT, msg, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
+		addGfxCmdText(x + SLIDER_HEIGHT / 2, y + SLIDER_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200));
+		addGfxCmdText(x + w - SLIDER_HEIGHT / 2, y + SLIDER_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_RIGHT, msg, isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200));
 	}
 	else
 	{
-		addGfxCmdText(x+SLIDER_HEIGHT/2, y+SLIDER_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128,128,128,200));
-		addGfxCmdText(x+w-SLIDER_HEIGHT/2, y+SLIDER_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_RIGHT, msg, imguiRGBA(128,128,128,200));
+		addGfxCmdText(x + SLIDER_HEIGHT / 2, y + SLIDER_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128, 128, 128, 200));
+		addGfxCmdText(x + w - SLIDER_HEIGHT / 2, y + SLIDER_HEIGHT / 2 - TEXT_HEIGHT / 2, IMGUI_ALIGN_RIGHT, msg, imguiRGBA(128, 128, 128, 200));
 	}
 
 	return res || valChanged;
@@ -663,18 +661,18 @@ void imguiUnindent()
 
 void imguiSeparator()
 {
-	g_state.widgetY -= DEFAULT_SPACING*3;
+	g_state.widgetY -= DEFAULT_SPACING * 3;
 }
 
 void imguiSeparatorLine()
 {
 	int x = g_state.widgetX;
-	int y = g_state.widgetY - DEFAULT_SPACING*2;
+	int y = g_state.widgetY - DEFAULT_SPACING * 2;
 	int w = g_state.widgetW;
 	int h = 1;
-	g_state.widgetY -= DEFAULT_SPACING*4;
+	g_state.widgetY -= DEFAULT_SPACING * 4;
 
-	addGfxCmdRect((float)x, (float)y, (float)w, (float)h, imguiRGBA(255,255,255,32));
+	addGfxCmdRect((float)x, (float)y, (float)w, (float)h, imguiRGBA(255, 255, 255, 32));
 }
 
 void imguiDrawText(int x, int y, int align, const char* text, unsigned int color)