migrating to the latest JUCE version
This commit is contained in:
@ -208,7 +208,7 @@ Rectangle<int> CustomLookAndFeel::getTabButtonExtraComponentBounds (const TabBar
|
||||
default: jassertfalse; break;
|
||||
}
|
||||
}
|
||||
else if (button.getExtraComponentPlacement() == TabBarButton::aboveText)
|
||||
else if (button.getExtraComponentPlacement() == TabBarButton::beforeText)
|
||||
{
|
||||
switch (orientation)
|
||||
{
|
||||
@ -224,7 +224,7 @@ Rectangle<int> CustomLookAndFeel::getTabButtonExtraComponentBounds (const TabBar
|
||||
//DBG("After Extra comp bounds: " << extraComp.toString())
|
||||
|
||||
}
|
||||
else if (button.getExtraComponentPlacement() == TabBarButton::belowText)
|
||||
else if (button.getExtraComponentPlacement() == TabBarButton::afterText)
|
||||
{
|
||||
switch (orientation)
|
||||
{
|
||||
@ -1182,9 +1182,9 @@ void CustomLookAndFeel::drawDrawableButton (Graphics& g, DrawableButton& button,
|
||||
// imageratio = sonobutt->getForegroundImageRatio();
|
||||
//}
|
||||
|
||||
if (button.getStyle() == DrawableButton::ImageAboveTextLabel || button.getStyle() == DrawableButton::ImageBelowTextLabel) {
|
||||
if (button.getStyle() == DrawableButton::ImageAboveTextLabel || button.getStyle() == DrawableButton::ImageAboveTextLabel) {
|
||||
textH = jmin (14, button.proportionOfHeight (0.2f));
|
||||
} else if (button.getStyle() == DrawableButton::ImageLeftOfTextLabel || button.getStyle() == DrawableButton::ImageRightOfTextLabel) {
|
||||
} else if (button.getStyle() == DrawableButton::ImageAboveTextLabel || button.getStyle() == DrawableButton::ImageAboveTextLabel) {
|
||||
textH = jmin (14, button.proportionOfHeight (0.8f));
|
||||
textW = jmax (20, button.proportionOfWidth (1.0f - imageratio));
|
||||
}
|
||||
@ -1205,19 +1205,19 @@ void CustomLookAndFeel::drawDrawableButton (Graphics& g, DrawableButton& button,
|
||||
button.getWidth() - 4, textH,
|
||||
Justification::centred, 1);
|
||||
}
|
||||
else if (button.getStyle() == DrawableButton::ImageBelowTextLabel) {
|
||||
else if (button.getStyle() == DrawableButton::ImageAboveTextLabel) {
|
||||
g.drawFittedText (button.getButtonText(),
|
||||
2, 1,
|
||||
button.getWidth() - 4, textH,
|
||||
Justification::centred, 1);
|
||||
}
|
||||
else if (button.getStyle() == DrawableButton::ImageRightOfTextLabel) {
|
||||
else if (button.getStyle() == DrawableButton::ImageAboveTextLabel) {
|
||||
g.drawFittedText (button.getButtonText(),
|
||||
2, 1,
|
||||
textW , button.getHeight() - 2,
|
||||
Justification::centred, 2, 0.6f);
|
||||
}
|
||||
else if (button.getStyle() == DrawableButton::ImageLeftOfTextLabel) {
|
||||
else if (button.getStyle() == DrawableButton::ImageAboveTextLabel) {
|
||||
g.drawFittedText (button.getButtonText(),
|
||||
button.getWidth() - textW - 4 , 1,
|
||||
textW , button.getHeight() - 2,
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
#include "juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h"
|
||||
#include "juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h"
|
||||
#include "juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h"
|
||||
#include "juce_audio_plugin_client/utility/juce_WindowsHooks.h"
|
||||
|
||||
#include <juce_audio_devices/juce_audio_devices.h>
|
||||
@ -63,7 +62,7 @@ public:
|
||||
|
||||
}
|
||||
|
||||
void urlOpened(const URL& url) override {
|
||||
void urlOpened(const URL& url) {
|
||||
|
||||
DBG("URL opened: " << url.toString(false));
|
||||
if (mainWindow.get() != nullptr)
|
||||
|
@ -98,7 +98,6 @@ GenericItemChooser::GenericItemChooser(const Array<GenericItemChooserItem> & ite
|
||||
table.getViewport()->setScrollBarsShown(true, false);
|
||||
table.getViewport()->setScrollOnDragEnabled(true);
|
||||
table.setRowSelectedOnMouseDown(true);
|
||||
table.setRowClickedOnMouseDown(false);
|
||||
table.setMultipleSelectionEnabled (false);
|
||||
table.setRowHeight(rowHeight);
|
||||
|
||||
|
@ -573,7 +573,7 @@ void PaulstretchpluginAudioProcessorEditor::showRenderDialog()
|
||||
int prefh = jmin(contentraw->getPreferredHeight(), getHeight() - 10);
|
||||
contentraw->setSize(prefw, prefh);
|
||||
std::unique_ptr<Component> content(contentraw);
|
||||
auto & cb = CallOutBox::launchAsynchronously(std::move(content), m_render_button.getBounds(), this, false);
|
||||
auto & cb = CallOutBox::launchAsynchronously(std::move(content), m_render_button.getBounds(), this);
|
||||
cb.setDismissalMouseClicksAreAlwaysConsumed(true);
|
||||
}
|
||||
|
||||
@ -635,7 +635,7 @@ void PaulstretchpluginAudioProcessorEditor::showSettings(bool flag)
|
||||
|
||||
Rectangle<int> bounds = dw->getLocalArea(nullptr, m_settings_button.getScreenBounds().reduced(10));
|
||||
DBG("callout bounds: " << bounds.toString());
|
||||
settingsCalloutBox = & CallOutBox::launchAsynchronously (std::move(wrap), bounds , dw, false);
|
||||
settingsCalloutBox = & CallOutBox::launchAsynchronously(std::move(wrap), bounds , dw);
|
||||
if (CallOutBox * box = dynamic_cast<CallOutBox*>(settingsCalloutBox.get())) {
|
||||
box->setDismissalMouseClicksAreAlwaysConsumed(true);
|
||||
}
|
||||
|
Reference in New Issue
Block a user