Skip to content

Commit e59b4cb

Browse files
falkTXfalkTX
committed
Auto-scale UIs
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 78a0d76 commit e59b4cb

File tree

7 files changed

+39
-17
lines changed

7 files changed

+39
-17
lines changed

‎dpf‎

Submodule dpf updated 43 files

‎plugins/PowerJuice/PowerJuiceUI.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ PowerJuiceUI::PowerJuiceUI()
101101

102102
// set default values
103103
programLoaded(0);
104+
105+
// automatically-scale
106+
setGeometryConstraints(PowerJuiceArtwork::backgroundWidth, PowerJuiceArtwork::backgroundHeight, true, true);
104107
}
105108

106109
// -----------------------------------------------------------------------
@@ -153,7 +156,7 @@ void PowerJuiceUI::imageButtonClicked(ImageButton* button, int)
153156
if (button != fButtonAbout)
154157
return;
155158

156-
fAboutWindow.exec();
159+
fAboutWindow.runAsModal();
157160
}
158161

159162
void PowerJuiceUI::imageKnobDragStarted(ImageKnob* knob)
@@ -213,7 +216,9 @@ void PowerJuiceUI::uiIdle()
213216

214217
void PowerJuiceUI::onDisplay()
215218
{
216-
fImgBackground.draw();
219+
const GraphicsContext& context(getGraphicsContext());
220+
221+
fImgBackground.draw(context);
217222

218223
if (dsp == nullptr)
219224
return;

‎plugins/PowerJuiceX2/PowerJuiceX2UI.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ PowerJuiceX2UI::PowerJuiceX2UI()
101101

102102
// set default values
103103
programLoaded(0);
104+
105+
// automatically-scale
106+
setGeometryConstraints(PowerJuiceX2Artwork::backgroundWidth, PowerJuiceX2Artwork::backgroundHeight, true, true);
104107
}
105108

106109
// -----------------------------------------------------------------------
@@ -153,7 +156,7 @@ void PowerJuiceX2UI::imageButtonClicked(ImageButton* button, int)
153156
if (button != fButtonAbout)
154157
return;
155158

156-
fAboutWindow.exec();
159+
fAboutWindow.runAsModal();
157160
}
158161

159162
void PowerJuiceX2UI::imageKnobDragStarted(ImageKnob* knob)
@@ -213,7 +216,9 @@ void PowerJuiceX2UI::uiIdle()
213216

214217
void PowerJuiceX2UI::onDisplay()
215218
{
216-
fImgBackground.draw();
219+
const GraphicsContext& context(getGraphicsContext());
220+
221+
fImgBackground.draw(context);
217222

218223
if (dsp == nullptr)
219224
return;

‎plugins/StutterJuice/StutterJuiceUI.cpp‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ StutterJuiceUI::StutterJuiceUI()
8181

8282
// set default values
8383
programLoaded(0);
84+
85+
// automatically-scale
86+
setGeometryConstraints(StutterJuiceArtwork::backgroundWidth, StutterJuiceArtwork::backgroundHeight, true, true);
8487
}
8588

8689
// -----------------------------------------------------------------------
@@ -112,7 +115,7 @@ void StutterJuiceUI::imageButtonClicked(ImageButton* button, int)
112115
if (button != fButtonAbout)
113116
return;
114117

115-
fAboutWindow.exec();
118+
fAboutWindow.runAsModal();
116119
}
117120

118121
void StutterJuiceUI::imageSliderDragStarted(ImageSlider* slider)
@@ -132,10 +135,12 @@ void StutterJuiceUI::imageSliderValueChanged(ImageSlider* slider, float value)
132135

133136
void StutterJuiceUI::onDisplay()
134137
{
135-
fImgBackground.draw();
138+
const GraphicsContext& context(getGraphicsContext());
139+
140+
fImgBackground.draw(context);
136141

137142
drawLFOs();
138-
fImgOverlay.draw();
143+
fImgOverlay.draw(context);
139144
}
140145

141146
// -----------------------------------------------------------------------

‎plugins/TriggerJuice/TriggerJuiceUI.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ TriggerJuiceUI::TriggerJuiceUI()
9898

9999
// set default values
100100
programLoaded(0);
101+
102+
// automatically-scale
103+
setGeometryConstraints(TriggerJuiceArtwork::backgroundWidth, TriggerJuiceArtwork::backgroundHeight, true, true);
101104
}
102105

103106
// -----------------------------------------------------------------------

‎plugins/VectorJuice/VectorJuiceUI.cpp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ START_NAMESPACE_DISTRHO
2525
// -----------------------------------------------------------------------
2626

2727
VectorJuiceUI::VectorJuiceUI()
28-
: UI(),
28+
: UI(VectorJuiceArtwork::backgroundWidth, VectorJuiceArtwork::backgroundHeight),
2929
fAboutWindow(this)
3030
{
31-
setSize(VectorJuiceArtwork::backgroundWidth, VectorJuiceArtwork::backgroundHeight);
32-
3331
// xy params
3432
paramX = paramY = 0.5f;
3533

@@ -186,6 +184,9 @@ VectorJuiceUI::VectorJuiceUI()
186184

187185
// set default values
188186
programLoaded(0);
187+
188+
// automatically-scale
189+
setGeometryConstraints(VectorJuiceArtwork::backgroundWidth, VectorJuiceArtwork::backgroundHeight, true, true);
189190
}
190191

191192
// -----------------------------------------------------------------------
@@ -303,7 +304,7 @@ void VectorJuiceUI::imageButtonClicked(ImageButton* button, int)
303304
if (button != fButtonAbout)
304305
return;
305306

306-
fAboutWindow.exec();
307+
fAboutWindow.runAsModal();
307308
}
308309

309310
void VectorJuiceUI::imageKnobDragStarted(ImageKnob* knob)
@@ -338,7 +339,9 @@ void VectorJuiceUI::imageSliderValueChanged(ImageSlider* slider, float value)
338339

339340
void VectorJuiceUI::onDisplay()
340341
{
341-
fImgBackground.draw();
342+
const GraphicsContext& context(getGraphicsContext());
343+
344+
fImgBackground.draw(context);
342345

343346
// get x, y mapped to XY area
344347
int x = fCanvasArea.getX() + paramX*fCanvasArea.getWidth() - fImgRoundlet.getWidth()/2;

‎plugins/WobbleJuice/WobbleJuiceUI.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@ START_NAMESPACE_DISTRHO
2323
// -----------------------------------------------------------------------
2424

2525
WobbleJuiceUI::WobbleJuiceUI()
26-
: UI(),
26+
: UI(WobbleJuiceArtwork::backgroundWidth, WobbleJuiceArtwork::backgroundHeight),
2727
fAboutWindow(this)
2828
{
29-
setSize(WobbleJuiceArtwork::backgroundWidth, WobbleJuiceArtwork::backgroundHeight);
30-
3129
// background
3230
fImgBackground = Image(WobbleJuiceArtwork::backgroundData, WobbleJuiceArtwork::backgroundWidth, WobbleJuiceArtwork::backgroundHeight, kImageFormatBGR);
3331

@@ -102,6 +100,9 @@ WobbleJuiceUI::WobbleJuiceUI()
102100

103101
// set default values
104102
programLoaded(0);
103+
104+
// automatically-scale
105+
setGeometryConstraints(WobbleJuiceArtwork::backgroundWidth, WobbleJuiceArtwork::backgroundHeight, true, true);
105106
}
106107

107108
// -----------------------------------------------------------------------
@@ -154,7 +155,7 @@ void WobbleJuiceUI::imageButtonClicked(ImageButton* button, int)
154155
if (button != fButtonAbout)
155156
return;
156157

157-
fAboutWindow.exec();
158+
fAboutWindow.runAsModal();
158159
}
159160

160161
void WobbleJuiceUI::imageKnobDragStarted(ImageKnob* knob)

0 commit comments

Comments
 (0)