resizing and button logic
This commit is contained in:
parent
025f80b1e1
commit
b5a8b01804
|
@ -32,7 +32,7 @@ void ButtonMappingWidget::onNanoDisplay()
|
||||||
beginPath();
|
beginPath();
|
||||||
strokeColor(200, 200, 200);
|
strokeColor(200, 200, 200);
|
||||||
fillColor(0.5f, 0.5f, 0.5f, 0.5f * (isClicked + isPenPressed));
|
fillColor(0.5f, 0.5f, 0.5f, 0.5f * (isClicked + isPenPressed));
|
||||||
roundedRect(0.f, 0.f, size, size, 0.5f * size);
|
roundedRect(0.f, 0.f, size, size, 0.25f * size);
|
||||||
stroke();
|
stroke();
|
||||||
fill();
|
fill();
|
||||||
closePath();
|
closePath();
|
||||||
|
@ -62,7 +62,8 @@ TabUI::TabUI()
|
||||||
|
|
||||||
if (!tab.initialized)
|
if (!tab.initialized)
|
||||||
return;
|
return;
|
||||||
// setGeometryConstraints(400, static_cast<uint>(300 * tabletAspectRatio), true, false);
|
float tabletAspectRatio = tab.ext.x ? tab.ext.y / tab.ext.x : 1.f;
|
||||||
|
setGeometryConstraints(400, static_cast<uint>(300 * tabletAspectRatio), true, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TabUI::getTabletData()
|
void TabUI::getTabletData()
|
||||||
|
@ -143,8 +144,8 @@ bool TabUI::onMouse(const MouseEvent &ev)
|
||||||
|
|
||||||
void TabUI::onResize(const ResizeEvent &ev)
|
void TabUI::onResize(const ResizeEvent &ev)
|
||||||
{
|
{
|
||||||
float x = ev.size.getWidth();
|
int x = static_cast<int>(ev.size.getWidth());
|
||||||
float y = ev.size.getHeight();
|
int y = static_cast<int>(ev.size.getHeight());
|
||||||
AButtonWidget.setAbsolutePos(x - 100, y - 100);
|
AButtonWidget.setAbsolutePos(x - 100, y - 100);
|
||||||
BButtonWidget.setAbsolutePos(x - 100, y - 200);
|
BButtonWidget.setAbsolutePos(x - 100, y - 200);
|
||||||
return UI::onResize(ev);
|
return UI::onResize(ev);
|
||||||
|
|
Loading…
Reference in New Issue