mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
fixed #250 tooltips don't stay in window geometry
This commit is contained in:
parent
dc8086f8b6
commit
d966c24bc3
|
@ -652,7 +652,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
|
|||
if (tooltip.isEmpty()) {
|
||||
tooltipWidget->hide();
|
||||
} else {
|
||||
tooltipWidget->moveTo(event->globalPos());
|
||||
tooltipWidget->moveTo(this, event->globalPos());
|
||||
tooltipWidget->setText(tooltip);
|
||||
tooltipWidget->show();
|
||||
}
|
||||
|
|
|
@ -211,7 +211,7 @@ void SplitHeader::mouseMoveEvent(QMouseEvent *event)
|
|||
{
|
||||
if (!this->dragging && this->isLive) {
|
||||
auto tooltipWidget = TooltipWidget::getInstance();
|
||||
tooltipWidget->moveTo(event->globalPos());
|
||||
tooltipWidget->moveTo(this, event->globalPos());
|
||||
tooltipWidget->setText(tooltip);
|
||||
tooltipWidget->show();
|
||||
}
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
#include "tooltipwidget.hpp"
|
||||
#include "singletons/thememanager.hpp"
|
||||
#include "singletons/fontmanager.hpp"
|
||||
#include "singletons/thememanager.hpp"
|
||||
|
||||
#include <QDesktopWidget>
|
||||
#include <QStyle>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
|
@ -9,7 +10,7 @@ namespace chatterino {
|
|||
namespace widgets {
|
||||
|
||||
TooltipWidget::TooltipWidget(BaseWidget *parent)
|
||||
: BaseWidget(parent)
|
||||
: BaseWindow(parent)
|
||||
, displayText(new QLabel())
|
||||
{
|
||||
QColor black(0, 0, 0);
|
||||
|
@ -21,11 +22,12 @@ TooltipWidget::TooltipWidget(BaseWidget *parent)
|
|||
this->setPalette(palette);
|
||||
this->displayText->setStyleSheet("color: #ffffff");
|
||||
this->setWindowOpacity(0.8);
|
||||
this->setFont(singletons::FontManager::getInstance().getFont(singletons::FontManager::Type::MediumSmall,
|
||||
this->getDpiMultiplier()));
|
||||
this->setFont(singletons::FontManager::getInstance().getFont(
|
||||
singletons::FontManager::Type::MediumSmall, this->getDpiMultiplier()));
|
||||
|
||||
this->setAttribute(Qt::WA_ShowWithoutActivating);
|
||||
this->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
|
||||
this->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint |
|
||||
Qt::X11BypassWindowManagerHint);
|
||||
|
||||
displayText->setAlignment(Qt::AlignHCenter);
|
||||
displayText->setText("lmao xD");
|
||||
|
@ -35,8 +37,8 @@ TooltipWidget::TooltipWidget(BaseWidget *parent)
|
|||
this->setLayout(layout);
|
||||
|
||||
singletons::FontManager::getInstance().fontChanged.connect([this] {
|
||||
this->setFont(singletons::FontManager::getInstance().getFont(singletons::FontManager::Type::MediumSmall,
|
||||
this->getDpiMultiplier()));
|
||||
this->setFont(singletons::FontManager::getInstance().getFont(
|
||||
singletons::FontManager::Type::MediumSmall, this->getDpiMultiplier()));
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -45,12 +47,39 @@ void TooltipWidget::setText(QString text)
|
|||
this->displayText->setText(text);
|
||||
}
|
||||
|
||||
void TooltipWidget::moveTo(QPoint point)
|
||||
void TooltipWidget::moveTo(QWidget *parent, QPoint point)
|
||||
{
|
||||
point.rx() += 16;
|
||||
point.ry() += 16;
|
||||
this->move(point);
|
||||
}
|
||||
|
||||
void TooltipWidget::resizeEvent(QResizeEvent *)
|
||||
{
|
||||
this->moveIntoDesktopRect(this);
|
||||
}
|
||||
|
||||
void TooltipWidget::moveIntoDesktopRect(QWidget *parent)
|
||||
{
|
||||
QDesktopWidget *desktop = QApplication::desktop();
|
||||
|
||||
QRect s = desktop->screenGeometry(parent);
|
||||
QRect w = this->geometry();
|
||||
|
||||
if (w.left() < s.left()) {
|
||||
w.moveLeft(s.left());
|
||||
}
|
||||
if (w.right() < s.right()) {
|
||||
w.moveRight(s.right());
|
||||
}
|
||||
if (w.top() < s.top()) {
|
||||
w.moveTop(s.top());
|
||||
}
|
||||
if (w.bottom() < s.bottom()) {
|
||||
w.moveBottom(s.bottom());
|
||||
}
|
||||
|
||||
this->setGeometry(w);
|
||||
}
|
||||
} // namespace widgets
|
||||
} // namespace chatterino
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#pragma once
|
||||
#include "widgets/basewidget.hpp"
|
||||
#include "widgets/basewindow.hpp"
|
||||
|
||||
#include <QLabel>
|
||||
#include <QWidget>
|
||||
|
@ -7,14 +7,14 @@
|
|||
namespace chatterino {
|
||||
namespace widgets {
|
||||
|
||||
class TooltipWidget : public BaseWidget
|
||||
class TooltipWidget : public BaseWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
TooltipWidget(BaseWidget *parent = nullptr);
|
||||
|
||||
void setText(QString text);
|
||||
void moveTo(QPoint point);
|
||||
void moveTo(QWidget *widget, QPoint point);
|
||||
|
||||
static TooltipWidget *getInstance()
|
||||
{
|
||||
|
@ -25,8 +25,13 @@ public:
|
|||
return tooltipWidget;
|
||||
}
|
||||
|
||||
protected:
|
||||
virtual void resizeEvent(QResizeEvent *) override;
|
||||
|
||||
private:
|
||||
QLabel *displayText;
|
||||
|
||||
void moveIntoDesktopRect(QWidget *parent);
|
||||
};
|
||||
|
||||
} // namespace widgets
|
||||
|
|
Loading…
Reference in a new issue