noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make emote popup remember last position (#1580)

Browse source 
* Use existing moveTo to ensure window stay within desktop geometry
This commit is contained in:
mmb L 2020-04-13 19:15:51 +08:00 committed by GitHub
parent 6f926e7d77
commit ebfcb49e8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/singletons/WindowManager.cpp
View file

@ -274,6 +274,16 @@ Window *WindowManager::windowAt(int index)
return this->windows_.at(index);
}
QPoint WindowManager::emotePopupPos()
{
return this->emotePopupPos_;
}
void WindowManager::setEmotePopupPos(QPoint pos)
{
this->emotePopupPos_ = pos;
}
void WindowManager::initialize(Settings &settings, Paths &paths)
{
assertInGuiThread();
@ -401,6 +411,10 @@ void WindowManager::initialize(Settings &settings, Paths &paths)
}
window.show();
QJsonObject emote_popup_obj = window_obj.value("emotePopup").toObject();
this->emotePopupPos_ = QPoint(emote_popup_obj.value("x").toInt(),
emote_popup_obj.value("y").toInt());
if (window_obj.value("state") == "minimized")
{
window.setWindowState(Qt::WindowMinimized);
@ -478,6 +492,11 @@ void WindowManager::save()
window_obj.insert("width", rect.width());
window_obj.insert("height", rect.height());
QJsonObject emote_popup_obj;
emote_popup_obj.insert("x", this->emotePopupPos_.x());
emote_popup_obj.insert("y", this->emotePopupPos_.y());
window_obj.insert("emotePopup", emote_popup_obj);
// window tabs
QJsonArray tabs_arr;

5
src/singletons/WindowManager.hpp
View file

@ -51,6 +51,9 @@ public:
int windowCount();
Window *windowAt(int index);
QPoint emotePopupPos();
void setEmotePopupPos(QPoint pos);
virtual void initialize(Settings &settings, Paths &paths) override;
virtual void save() override;
void closeAll();
@ -89,6 +92,8 @@ private:
bool initialized_ = false;
QPoint emotePopupPos_;
std::atomic<int> generation_{0};
std::vector<Window *> windows_;

8
src/widgets/dialogs/EmotePopup.cpp
View file

@ -8,6 +8,7 @@
#include "messages/MessageBuilder.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "singletons/Emotes.hpp"
#include "singletons/WindowManager.hpp"
#include "util/Shortcut.hpp"
#include "widgets/Notebook.hpp"
#include "widgets/helper/ChannelView.hpp"
@ -113,6 +114,8 @@ namespace {
EmotePopup::EmotePopup(QWidget *parent)
: BasePopup(BaseWindow::EnableCustomFrame, parent)
{
this->moveTo(this, getApp()->windows->emotePopupPos());
auto layout = new QVBoxLayout(this);
this->getLayoutContainer()->setLayout(layout);
@ -220,4 +223,9 @@ void EmotePopup::loadEmojis()
this->viewEmojis_->setChannel(emojiChannel);
}
void EmotePopup::closeEvent(QCloseEvent *event)
{
getApp()->windows->setEmotePopupPos(this->pos());
QWidget::closeEvent(event);
}
} // namespace chatterino

2
src/widgets/dialogs/EmotePopup.hpp
View file

@ -19,6 +19,8 @@ public:
void loadChannel(ChannelPtr channel);
void loadEmojis();
virtual void closeEvent(QCloseEvent *event) override;
pajlada::Signals::Signal<Link> linkClicked;
private: