brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a single widget for resize, always show handle

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-01-26 18:50:31 +00:00
parent ec15f95f32
commit 5282da24e9
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
6 changed files with 77 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/CardinalUI.cpp
View file

@ -70,6 +70,15 @@ GLFWAPI void glfwSetClipboardString(GLFWwindow*, const char* const text)
context->ui->setClipboard(nullptr, text, std::strlen(text)+1);
}
GLFWAPI void glfwSetCursor(GLFWwindow*, GLFWcursor* const cursor)
{
CardinalPluginContext* const context = static_cast<CardinalPluginContext*>(APP);
DISTRHO_SAFE_ASSERT_RETURN(context != nullptr,);
DISTRHO_SAFE_ASSERT_RETURN(context->ui != nullptr,);
context->ui->setCursor(cursor != nullptr ? kMouseCursorDiagonal : kMouseCursorArrow);
}
GLFWAPI double glfwGetTime(void)
{
CardinalPluginContext* const context = static_cast<CardinalPluginContext*>(APP);
@ -181,7 +190,6 @@ GLFWAPI const char* glfwGetKeyName(const int key, int)
namespace rack {
namespace app {
widget::Widget* createMenuBar(bool isStandalone);
void hideResizeHandle(Scene* scene);
}
namespace window {
void WindowSetPluginUI(Window* window, DISTRHO_NAMESPACE::UI* ui);
@ -231,7 +239,6 @@ class CardinalUI : public CardinalBaseUI,
public WindowParametersCallback
{
rack::math::Vec fLastMousePos;
ResizeHandle fResizeHandle;
WindowParameters fWindowParameters;
int fRateLimitStep = 0;
@ -263,20 +270,13 @@ class CardinalUI : public CardinalBaseUI,
public:
CardinalUI()
: CardinalBaseUI(1228, 666),
fResizeHandle(this)
: CardinalBaseUI(1228, 666)
{
Window& window(getWindow());
window.setIgnoringKeyRepeat(true);
context->nativeWindowId = window.getNativeWindowHandle();
if (isResizable())
{
fResizeHandle.hide();
hideResizeHandle(context->scene);
}
const double scaleFactor = getScaleFactor();
setGeometryConstraints(648 * scaleFactor, 538 * scaleFactor);