Skip to content

Commit d50e54c

Browse files
committed
plugin: move buttons and resize handler to the bottom
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 0286043 commit d50e54c

3 files changed

Lines changed: 14 additions & 17 deletions

File tree

src/plugin/DesktopUI.cpp

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,36 +41,28 @@ class DesktopUI : public UI,
4141
buttonRefresh.setId(1);
4242
buttonRefresh.setLabel("Refresh");
4343
buttonRefresh.setFontScale(scaleFactor);
44-
buttonRefresh.setAbsolutePos(2 * scaleFactor, 2 * scaleFactor);
44+
buttonRefresh.setAbsolutePos(2 * scaleFactor, getHeight() - 28 * scaleFactor);
4545
buttonRefresh.setSize(70 * scaleFactor, 26 * scaleFactor);
4646

4747
buttonOpenUserFilesDir.setId(2);
4848
buttonOpenUserFilesDir.setLabel("Open User Files Dir");
4949
buttonOpenUserFilesDir.setFontScale(scaleFactor);
50-
buttonOpenUserFilesDir.setAbsolutePos(74 * scaleFactor, 2 * scaleFactor);
50+
buttonOpenUserFilesDir.setAbsolutePos(74 * scaleFactor, getHeight() - 28 * scaleFactor);
5151
buttonOpenUserFilesDir.setSize(140 * scaleFactor, 26 * scaleFactor);
5252

5353
buttonOpenWebGui.setId(3);
5454
buttonOpenWebGui.setLabel("Open in Web Browser");
5555
buttonOpenWebGui.setFontScale(scaleFactor);
56-
buttonOpenWebGui.setAbsolutePos(216 * scaleFactor, 2 * scaleFactor);
56+
buttonOpenWebGui.setAbsolutePos(216 * scaleFactor, getHeight() - 28 * scaleFactor);
5757
buttonOpenWebGui.setSize(150 * scaleFactor, 26 * scaleFactor);
5858
buttonOpenWebGui.hide();
5959

6060
label = "MOD Desktop ";
6161
label += getPluginFormatName();
6262
label += " v" VERSION;
6363

64-
if (d_isNotEqual(scaleFactor, 1.0))
65-
{
66-
setGeometryConstraints((DISTRHO_UI_DEFAULT_WIDTH - 100) * scaleFactor,
67-
DISTRHO_UI_DEFAULT_HEIGHT * scaleFactor);
68-
setSize(DISTRHO_UI_DEFAULT_WIDTH * scaleFactor, DISTRHO_UI_DEFAULT_HEIGHT * scaleFactor);
69-
}
70-
else
71-
{
72-
setGeometryConstraints(DISTRHO_UI_DEFAULT_WIDTH - 100, DISTRHO_UI_DEFAULT_HEIGHT);
73-
}
64+
setGeometryConstraints((DISTRHO_UI_DEFAULT_WIDTH - 100) * scaleFactor,
65+
(DISTRHO_UI_DEFAULT_HEIGHT - 100) * scaleFactor);
7466
}
7567

7668
~DesktopUI() override
@@ -167,7 +159,7 @@ class DesktopUI : public UI,
167159

168160
uint offset = kVerticalOffset * scaleFactor;
169161
uint width = getWidth();
170-
uint height = getHeight() - offset;
162+
uint height = getHeight() - offset * 2;
171163

172164
WebViewOptions opts;
173165
opts.offset.y = offset;
@@ -257,11 +249,16 @@ class DesktopUI : public UI,
257249
{
258250
UI::onResize(ev);
259251

252+
const int y = ev.size.getHeight() - 28 * getScaleFactor();
253+
buttonRefresh.setAbsoluteY(y);
254+
buttonOpenUserFilesDir.setAbsoluteY(y);
255+
buttonOpenWebGui.setAbsoluteY(y);
256+
260257
if (webview == nullptr)
261258
return;
262259

263260
const double scaleFactor = getScaleFactor();
264-
const uint offset = kVerticalOffset * scaleFactor;
261+
const uint offset = kVerticalOffset * scaleFactor * 2;
265262
const uint width = ev.size.getWidth();
266263
const uint height = ev.size.getHeight() - offset;
267264

src/plugin/DistrhoPluginInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define DISTRHO_PLUGIN_WANT_FULL_STATE 1
2323
#define DISTRHO_PLUGIN_WANT_WEBVIEW 1
2424
#define DISTRHO_UI_DEFAULT_WIDTH 1170
25-
#define DISTRHO_UI_DEFAULT_HEIGHT 600
25+
#define DISTRHO_UI_DEFAULT_HEIGHT 630
2626
#define DISTRHO_UI_FILE_BROWSER 0
2727
#define DISTRHO_UI_USE_NANOVG 1
2828
#define DISTRHO_UI_USER_RESIZABLE 1

src/plugin/ResizeHandle.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class ResizeHandle : public TopLevelWidget
171171
const uint margin = 0.0 * scaleFactor;
172172
const uint size = handleSize * scaleFactor;
173173

174-
area = Rectangle<uint>(getWidth() - size - margin, 30 * scaleFactor - size, size, size);
174+
area = Rectangle<uint>(getWidth() - size - margin, getHeight() - size, size, size);
175175

176176
recreateLines(area.getX(), area.getY(), size);
177177
}

0 commit comments

Comments
 (0)