Remove offset logic from BaseWindow::moveTo (#4798)
It's now up to each window to offset its coordinates themselves (which is good 👍 )
This commit is contained in:
@@ -923,7 +923,7 @@ void CommandController::initialize(Settings &, Paths &paths)
|
||||
static_cast<QWidget *>(&(getApp()->windows->getMainWindow())),
|
||||
currentSplit);
|
||||
userPopup->setData(userName, channel);
|
||||
userPopup->moveTo(QCursor::pos(), false,
|
||||
userPopup->moveTo(QCursor::pos(),
|
||||
BaseWindow::BoundsChecker::CursorPosition);
|
||||
userPopup->show();
|
||||
return "";
|
||||
|
||||
@@ -503,14 +503,8 @@ void BaseWindow::leaveEvent(QEvent *)
|
||||
TooltipWidget::instance()->hide();
|
||||
}
|
||||
|
||||
void BaseWindow::moveTo(QPoint point, bool offset, BoundsChecker boundsChecker)
|
||||
void BaseWindow::moveTo(QPoint point, BoundsChecker boundsChecker)
|
||||
{
|
||||
if (offset)
|
||||
{
|
||||
point.rx() += 16;
|
||||
point.ry() += 16;
|
||||
}
|
||||
|
||||
switch (boundsChecker)
|
||||
{
|
||||
case BoundsChecker::Off: {
|
||||
|
||||
@@ -65,7 +65,7 @@ public:
|
||||
void setActionOnFocusLoss(ActionOnFocusLoss value);
|
||||
ActionOnFocusLoss getActionOnFocusLoss() const;
|
||||
|
||||
void moveTo(QPoint point, bool offset, BoundsChecker boundsChecker);
|
||||
void moveTo(QPoint point, BoundsChecker boundsChecker);
|
||||
|
||||
float scale() const override;
|
||||
float qtFontScale() const;
|
||||
|
||||
@@ -207,7 +207,7 @@ EmotePopup::EmotePopup(QWidget *parent)
|
||||
, notebook_(new Notebook(this))
|
||||
{
|
||||
// this->setStayInScreenRect(true);
|
||||
this->moveTo(getApp()->windows->emotePopupPos(), false,
|
||||
this->moveTo(getApp()->windows->emotePopupPos(),
|
||||
BaseWindow::BoundsChecker::DesiredPosition);
|
||||
|
||||
auto *layout = new QVBoxLayout();
|
||||
|
||||
@@ -1810,7 +1810,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
|
||||
}
|
||||
}
|
||||
|
||||
tooltipWidget->moveTo(event->globalPos(), true,
|
||||
tooltipWidget->moveTo(event->globalPos() + QPoint(16, 16),
|
||||
BaseWindow::BoundsChecker::CursorPosition);
|
||||
tooltipWidget->setWordWrap(isLinkValid);
|
||||
tooltipWidget->show();
|
||||
@@ -2665,7 +2665,7 @@ void ChannelView::showUserInfoPopup(const QString &userName,
|
||||
userPopup->setData(userName, contextChannel, openingChannel);
|
||||
|
||||
QPoint offset(userPopup->width() / 3, userPopup->height() / 5);
|
||||
userPopup->moveTo(QCursor::pos() - offset, false,
|
||||
userPopup->moveTo(QCursor::pos() - offset,
|
||||
BaseWindow::BoundsChecker::CursorPosition);
|
||||
userPopup->show();
|
||||
}
|
||||
|
||||
@@ -955,7 +955,7 @@ void SplitHeader::enterEvent(QEvent *event)
|
||||
auto pos = this->mapToGlobal(this->rect().bottomLeft()) +
|
||||
QPoint((this->width() - tooltip->width()) / 2, 1);
|
||||
|
||||
tooltip->moveTo(pos, false, BaseWindow::BoundsChecker::CursorPosition);
|
||||
tooltip->moveTo(pos, BaseWindow::BoundsChecker::CursorPosition);
|
||||
tooltip->show();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user