Merge branch 'master' of github.com:bkaradzic/bgfx

examples/common/imgui/imgui.cpp

@@ -1031,7 +1031,12 @@ struct Imgui
 			}
 		}
 
-		nvgResetScissor(m_nvg);
+		nvgScissor(m_nvg
+				 , float(parentArea.m_scissorX)
+				 , float(parentArea.m_scissorY-1)
+				 , float(parentArea.m_scissorWidth)
+				 , float(parentArea.m_scissorHeight+1)
+				 );
 	}
 
 	bool beginArea(const char* _name, int32_t _x, int32_t _y, int32_t _width, int32_t _height, bool _enabled, int32_t _r)
@@ -3155,6 +3160,11 @@ int32_t imguiGetWidgetY()
 	return s_imgui.getCurrentArea().m_widgetY;
 }
 
+int32_t imguiGetWidgetW()
+{
+	return s_imgui.getCurrentArea().m_widgetW;
+}
+
 void imguiSetCurrentScissor()
 {
 	return s_imgui.setCurrentScissor();

examples/common/imgui/imgui.h

@@ -149,6 +149,7 @@ void imguiSeparatorLine(uint16_t _height = IMGUI_SEPARATOR_VALUE);
 
 int32_t imguiGetWidgetX();
 int32_t imguiGetWidgetY();
+int32_t imguiGetWidgetW();
 void imguiSetCurrentScissor(); // Call before drawing custom widgets over imgui area.
 
 bool imguiButton(const char* _text, bool _enabled = true, ImguiAlign::Enum _align = ImguiAlign::LeftIndented, uint32_t _rgb0 = IMGUI_BUTTON_RGB0, int32_t _r = IMGUI_BUTTON_R);