Martchus
71c56edfd8
* Remove experimental pinning feature again and instead allow using a
normal window
* Pinning made it inconvenient to close the (frameless) window again
* Pinning required hiding/showing the window which didn't look very
nice (and setting flags directly via `QWindow` didn't work as well)
* As normal application/window positioning issues on Wayland are less
problematic (and those aren't going to be fixed any time soon, if at all)
87 lines
2.2 KiB
C++
87 lines
2.2 KiB
C++
#include "./traymenu.h"
|
|
#include "./trayicon.h"
|
|
#include "./traywidget.h"
|
|
|
|
#include <syncthingwidgets/settings/settings.h>
|
|
|
|
#include <qtutilities/misc/dialogutils.h>
|
|
|
|
#include <QApplication>
|
|
#include <QHBoxLayout>
|
|
#include <QWindow>
|
|
|
|
using namespace QtUtilities;
|
|
|
|
namespace QtGui {
|
|
|
|
TrayMenu::TrayMenu(TrayIcon *trayIcon, QWidget *parent)
|
|
: QMenu(parent)
|
|
, m_trayIcon(trayIcon)
|
|
, m_windowed(false)
|
|
{
|
|
setObjectName(QStringLiteral("QtGui::TrayMenu"));
|
|
auto *const menuLayout = new QHBoxLayout;
|
|
menuLayout->setContentsMargins(0, 0, 0, 0);
|
|
menuLayout->setSpacing(0);
|
|
menuLayout->addWidget(m_trayWidget = new TrayWidget(this));
|
|
setLayout(menuLayout);
|
|
setPlatformMenu(nullptr);
|
|
setWindowFlags(Qt::FramelessWindowHint | Qt::Popup);
|
|
setWindowIcon(m_trayWidget->windowIcon());
|
|
}
|
|
|
|
QSize TrayMenu::sizeHint() const
|
|
{
|
|
return Settings::values().appearance.trayMenuSize;
|
|
}
|
|
|
|
/*!
|
|
* \brief Moves the specified \a innerRect at the specified \a point into the specified \a outerRect
|
|
* by altering \a point.
|
|
*/
|
|
void moveInside(QPoint &point, const QSize &innerRect, const QRect &outerRect)
|
|
{
|
|
if (point.y() < outerRect.top()) {
|
|
point.setY(outerRect.top());
|
|
} else if (point.y() + innerRect.height() > outerRect.bottom()) {
|
|
point.setY(outerRect.bottom() - innerRect.height());
|
|
}
|
|
if (point.x() < outerRect.left()) {
|
|
point.setX(outerRect.left());
|
|
} else if (point.x() + innerRect.width() > outerRect.right()) {
|
|
point.setX(outerRect.right() - innerRect.width());
|
|
}
|
|
}
|
|
|
|
void TrayMenu::showUsingPositioningSettings()
|
|
{
|
|
resize(sizeHint());
|
|
auto pos = Settings::values().appearance.positioning.positionToUse();
|
|
moveInside(pos, size(), availableScreenGeometryAtPoint(pos));
|
|
popup(pos);
|
|
activateWindow();
|
|
}
|
|
|
|
void TrayMenu::setWindowed(bool windowed)
|
|
{
|
|
if (m_windowed != windowed) {
|
|
setWindowFlags((m_windowed = windowed) ? Qt::Window : Qt::FramelessWindowHint | Qt::Popup);
|
|
}
|
|
}
|
|
|
|
void TrayMenu::mousePressEvent(QMouseEvent *event)
|
|
{
|
|
if (!m_windowed) {
|
|
QMenu::mousePressEvent(event);
|
|
}
|
|
}
|
|
|
|
void TrayMenu::mouseReleaseEvent(QMouseEvent *event)
|
|
{
|
|
if (!m_windowed) {
|
|
QMenu::mouseReleaseEvent(event);
|
|
}
|
|
}
|
|
|
|
} // namespace QtGui
|