flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-06 02:16:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T506, warning if widget too small for overlay messages

Browse Source
This commit is contained in:
Klaus Basan
2019-01-07 20:50:20 +01:00
committed by Mat Sutcliffe
parent 8bb1915d97
commit ed2acf4d74
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackgui/overlaymessagesframe.h
View File

@@ -17,8 +17,9 @@
#include "blackgui/guiutility.h" #include "blackgui/guiutility.h"
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackmisc/network/textmessage.h" #include "blackmisc/network/textmessage.h"
#include "blackmisc/pixmap.h"
#include "blackmisc/statusmessagelist.h" #include "blackmisc/statusmessagelist.h"
#include "blackmisc/pixmap.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/variant.h" #include "blackmisc/variant.h"
#include <QFrame> #include <QFrame>
@@ -125,6 +126,7 @@ namespace BlackGui
{ {
if (messages.isEmpty()) { return; } if (messages.isEmpty()) { return; }
this->initInnerFrame(); this->initInnerFrame();
if (!this->hasMinimumSize(150, 150)) { return; }
m_overlayMessages->showOverlayMessagesWithConfirmation(messages, appendOldMessages, confirmationMessage, okLambda, defaultButton, timeOutMs); m_overlayMessages->showOverlayMessagesWithConfirmation(messages, appendOldMessages, confirmationMessage, okLambda, defaultButton, timeOutMs);
WIDGET::repaint(); WIDGET::repaint();
} }
@@ -214,6 +216,7 @@ namespace BlackGui
void showOverlayInlineTextMessage(Components::TextMessageTab tab) void showOverlayInlineTextMessage(Components::TextMessageTab tab)
{ {
this->initInnerFrame(0.75, 0.75); this->initInnerFrame(0.75, 0.75);
if (!this->hasMinimumSize(150, 150)) { return; }
m_overlayMessages->showOverlayInlineTextMessage(tab); m_overlayMessages->showOverlayInlineTextMessage(tab);
WIDGET::repaint(); WIDGET::repaint();
} }
@@ -222,6 +225,7 @@ namespace BlackGui
void showOverlayInlineTextMessage(const BlackMisc::Aviation::CCallsign &callsign) void showOverlayInlineTextMessage(const BlackMisc::Aviation::CCallsign &callsign)
{ {
this->initInnerFrame(0.75, 0.75); this->initInnerFrame(0.75, 0.75);
if (!this->hasMinimumSize(150, 150)) { return; }
m_overlayMessages->showOverlayInlineTextMessage(callsign); m_overlayMessages->showOverlayInlineTextMessage(callsign);
WIDGET::repaint(); WIDGET::repaint();
} }
@@ -254,6 +258,7 @@ namespace BlackGui
const int h = inner.height(); const int h = inner.height();
const int x = middle.x() - w / 2; const int x = middle.x() - w / 2;
const int y = qRound(middle.y() - h / m_middleFactor); const int y = qRound(middle.y() - h / m_middleFactor);
m_overlayMessages->setGeometry(x, y, w, h); m_overlayMessages->setGeometry(x, y, w, h);
m_overlayMessages->setVisible(true); m_overlayMessages->setVisible(true);
} }
@@ -277,6 +282,23 @@ namespace BlackGui
m_overlayMessages->setGeometry(x, y, w, h); m_overlayMessages->setGeometry(x, y, w, h);
} }
//! Check minimum height/width
bool hasMinimumSize(int w, int h) const
{
if (w > 0 && m_overlayMessages->width() < w)
{
BlackMisc::CLogMessage(this).info(u"Overlay widget too small (w)");
return false;
}
if (h > 0 && m_overlayMessages->height() < h)
{
BlackMisc::CLogMessage(this).info(u"Overlay widget too small (h)");
return false;
}
return true;
}
//! \copydoc QFrame::keyPressEvent //! \copydoc QFrame::keyPressEvent
virtual void keyPressEvent(QKeyEvent *event) override virtual void keyPressEvent(QKeyEvent *event) override
{ {