mirror of
https://github.com/scratchfoundation/bgfx.git
synced 2024-11-28 18:45:54 -05:00
IMGUI: Fixed scroll area scissor.
This commit is contained in:
parent
ddda9e29b0
commit
f412b8bc90
1 changed files with 18 additions and 17 deletions
|
@ -506,14 +506,15 @@ struct Imgui
|
|||
m_widgetX = _x + SCROLL_AREA_PADDING;
|
||||
m_widgetY = _y + AREA_HEADER + (*_scroll);
|
||||
m_widgetW = _width - SCROLL_AREA_PADDING * 4;
|
||||
m_scrollTop = _y + SCROLL_AREA_PADDING;
|
||||
m_scrollBottom = _y - AREA_HEADER + _height;
|
||||
m_scrollRight = _x + _width - SCROLL_AREA_PADDING * 3;
|
||||
m_scrollVal = _scroll;
|
||||
|
||||
m_scrollTop = _y + AREA_HEADER;
|
||||
m_scrollBottom = _y + _height;
|
||||
m_scrollRight = _x + _width - SCROLL_AREA_PADDING * 3;
|
||||
|
||||
m_scrollVal = _scroll;
|
||||
m_scrollAreaX = _x;
|
||||
m_scrollAreaWidth = _width;
|
||||
m_scrollAreaTop = m_widgetY - AREA_HEADER;
|
||||
m_scrollAreaTop = m_widgetY + SCROLL_AREA_PADDING;
|
||||
|
||||
m_focusTop = _y - AREA_HEADER;
|
||||
m_focusBottom = _y - AREA_HEADER + _height;
|
||||
|
@ -538,13 +539,13 @@ struct Imgui
|
|||
|
||||
nvgScissor(m_nvg
|
||||
, float(_x + SCROLL_AREA_PADDING)
|
||||
, float(_y + SCROLL_AREA_PADDING)
|
||||
, float(_y + AREA_HEADER)
|
||||
, float(_width - SCROLL_AREA_PADDING * 4)
|
||||
, float(_height - AREA_HEADER - SCROLL_AREA_PADDING)
|
||||
);
|
||||
|
||||
m_scissor = bgfx::setScissor(uint16_t(_x + SCROLL_AREA_PADDING)
|
||||
, uint16_t(_y + SCROLL_AREA_PADDING)
|
||||
, uint16_t(_y + AREA_HEADER)
|
||||
, uint16_t(_width - SCROLL_AREA_PADDING * 4)
|
||||
, uint16_t(_height - AREA_HEADER - SCROLL_AREA_PADDING)
|
||||
);
|
||||
|
@ -586,17 +587,17 @@ struct Imgui
|
|||
buttonLogic(hid, over);
|
||||
if (isActive(hid) )
|
||||
{
|
||||
float u = (float)(hy - yy) / (float)range;
|
||||
float uu = (float)(hy - yy) / (float)range;
|
||||
if (m_wentActive)
|
||||
{
|
||||
m_dragY = m_my;
|
||||
m_dragOrig = u;
|
||||
m_dragOrig = uu;
|
||||
}
|
||||
|
||||
if (m_dragY != m_my)
|
||||
{
|
||||
u = bx::fsaturate(m_dragOrig + (m_my - m_dragY) / (float)range);
|
||||
*m_scrollVal = (int)(u * (height - sh) );
|
||||
uu = bx::fsaturate(m_dragOrig + (m_my - m_dragY) / (float)range);
|
||||
*m_scrollVal = (int)(uu * (height - sh) );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue