mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Projucer: Take title bar into account when keeping windows onscreen

Browse source
This commit is contained in:
ed 2020-01-06 10:47:25 +00:00
parent 496516fd1a
commit 8b64915fa1
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/Projucer/Source/Application/jucer_Application.cpp
View file

@ -1163,9 +1163,11 @@ bool ProjucerApplication::perform (const InvocationInfo& info)
void ProjucerApplication::createNewProject()
{
auto* mw = mainWindowList.getOrCreateEmptyWindow();
jassert (mw != nullptr);
mw->showStartPage();
mainWindowList.checkWindowBounds (mw);
mainWindowList.checkWindowBounds (*mw);
}
void ProjucerApplication::createNewProjectFromClipboard()

22
extras/Projucer/Source/Application/jucer_MainWindow.cpp
View file

@ -680,11 +680,12 @@ bool MainWindowList::openFile (const File& file, bool openInBackground)
WeakReference<Component> previousFrontWindow (getFrontmostWindow());
auto* w = getOrCreateEmptyWindow();
jassert (w != nullptr);
if (w->openFile (file))
{
w->makeVisible();
checkWindowBounds (w);
checkWindowBounds (*w);
if (openInBackground && previousFrontWindow != nullptr)
previousFrontWindow->toFront (true);
@ -718,8 +719,10 @@ MainWindow* MainWindowList::getFrontmostWindow (bool createIfNotFound)
if (createIfNotFound)
{
auto* w = createNewMainWindow();
jassert (w != nullptr);
w->makeVisible();
checkWindowBounds (w);
checkWindowBounds (*w);
return w;
}
@ -771,16 +774,16 @@ MainWindow* MainWindowList::getMainWindowForFile (const File& file)
return nullptr;
}
void MainWindowList::checkWindowBounds (MainWindow* windowToCheck)
void MainWindowList::checkWindowBounds (MainWindow& windowToCheck)
{
auto avoidSuperimposedWindows = [&]
{
for (auto* otherWindow : windows)
{
if (otherWindow == windowToCheck)
if (otherWindow == nullptr || otherWindow == &windowToCheck)
continue;
auto boundsToCheck = windowToCheck->getScreenBounds();
auto boundsToCheck = windowToCheck.getScreenBounds();
auto otherBounds = otherWindow->getScreenBounds();
if (std::abs (boundsToCheck.getX() - otherBounds.getX()) < 3
@ -793,23 +796,26 @@ void MainWindowList::checkWindowBounds (MainWindow* windowToCheck)
if (otherBounds.getCentreX() >= boundsToCheck.getCentreX()) dx = -dx;
if (otherBounds.getCentreY() >= boundsToCheck.getCentreY()) dy = -dy;
windowToCheck->setBounds (boundsToCheck.translated (dx, dy));
windowToCheck.setBounds (boundsToCheck.translated (dx, dy));
}
}
};
auto ensureWindowIsFullyOnscreen = [&]
{
auto windowBounds = windowToCheck->getScreenBounds();
auto windowBounds = windowToCheck.getScreenBounds();
auto screenLimits = Desktop::getInstance().getDisplays().findDisplayForRect (windowBounds).userArea;
if (auto* peer = windowToCheck.getPeer())
peer->getFrameSize().subtractFrom (screenLimits);
auto constrainedX = jlimit (screenLimits.getX(), screenLimits.getRight() - windowBounds.getWidth(), windowBounds.getX());
auto constrainedY = jlimit (screenLimits.getY(), screenLimits.getBottom() - windowBounds.getHeight(), windowBounds.getY());
Point<int> constrainedTopLeft (constrainedX, constrainedY);
if (windowBounds.getPosition() != constrainedTopLeft)
windowToCheck->setTopLeftPosition (constrainedTopLeft);
windowToCheck.setTopLeftPosition (constrainedTopLeft);
};
avoidSuperimposedWindows();

2
extras/Projucer/Source/Application/jucer_MainWindow.h
View file

@ -119,7 +119,7 @@ public:
void reopenLastProjects();
void saveCurrentlyOpenProjectList();
void checkWindowBounds (MainWindow*);
void checkWindowBounds (MainWindow&);
void sendLookAndFeelChange();