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

fix: make LoginWidget child of AccountsPage (#2234)

Browse source
This commit is contained in:
Leon Richardt 2020-11-29 10:48:23 +01:00 committed by GitHub
parent 5258ddd84f
commit 0a0cfb8e48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -33,7 +33,7 @@
- Minor: Improve UX of the "Login expired!" message (#2029) - Minor: Improve UX of the "Login expired!" message (#2029)
- Minor: PageUp and PageDown now scroll in the selected split (#2070, #2081) - Minor: PageUp and PageDown now scroll in the selected split (#2070, #2081)
- Minor: Allow highlights to be excluded from `/mentions`. Excluded highlights will not trigger tab highlights either. (#1793, #2036) - Minor: Allow highlights to be excluded from `/mentions`. Excluded highlights will not trigger tab highlights either. (#1793, #2036)
- Minor: Flag all popup dialogs as actual dialogs so they get the relevant window manager hints (#1843, #2182, #2185, #2232) - Minor: Flag all popup dialogs as actual dialogs so they get the relevant window manager hints (#1843, #2182, #2185, #2232, #2234)
- Minor: Don't show update button for nightly builds on macOS and Linux, this was already the case for Windows (#2163, #2164) - Minor: Don't show update button for nightly builds on macOS and Linux, this was already the case for Windows (#2163, #2164)
- Bugfix: Fix crash occurring when pressing Escape in the Color Picker Dialog (#1843) - Bugfix: Fix crash occurring when pressing Escape in the Color Picker Dialog (#1843)
- Bugfix: Fix bug preventing users from setting the highlight color of the second entry in the "User" highlights tab (#1898) - Bugfix: Fix bug preventing users from setting the highlight color of the second entry in the "User" highlights tab (#1898)

3
src/widgets/dialogs/LoginDialog.cpp
View file

@ -245,7 +245,8 @@ void AdvancedLoginWidget::refreshButtons()
} }
} }
LoginWidget::LoginWidget() LoginWidget::LoginWidget(QWidget *parent)
: QDialog(parent)
{ {
#ifdef USEWINSDK #ifdef USEWINSDK
::SetWindowPos(HWND(this->winId()), HWND_TOPMOST, 0, 0, 0, 0, ::SetWindowPos(HWND(this->winId()), HWND_TOPMOST, 0, 0, 0, 0,

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

@ -64,7 +64,7 @@ public:
class LoginWidget : public QDialog class LoginWidget : public QDialog
{ {
public: public:
LoginWidget(); LoginWidget(QWidget *parent);
private: private:
struct { struct {

4
src/widgets/settingspages/AccountsPage.cpp
View file

@ -32,8 +32,8 @@ AccountsPage::AccountsPage()
view->getTableView()->horizontalHeader()->setVisible(false); view->getTableView()->horizontalHeader()->setVisible(false);
view->getTableView()->horizontalHeader()->setStretchLastSection(true); view->getTableView()->horizontalHeader()->setStretchLastSection(true);
view->addButtonPressed.connect([] { view->addButtonPressed.connect([this] {
static auto loginWidget = new LoginWidget(); static auto loginWidget = new LoginWidget(this);
loginWidget->show(); loginWidget->show();
loginWidget->raise(); loginWidget->raise();