mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4438: FEAT(talking-ui): Save last position

Browse Source 
In order for the UI to not pop-up in the middle of the MainWindow (or
any other default location) after you have placed it carefully the last
time, this commit makes the UI's position to be saved and restored.

For cases in which there is no position set yet, it will be positioned
to the right of the initial position of the MainWindow.

Note that the UI's position is only saved if it is visible at the time
Mumble is closed which is used as an indication that the user is
actually using it (and has thus placed it explicitly).
This commit is contained in:
Robert Adam 2020-08-27 18:05:08 +02:00 committed by GitHub
commit 407cdc95d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mumble/MainWindow.cpp
View File

@ -485,6 +485,13 @@ void MainWindow::closeEvent(QCloseEvent *e) {
g.s.qbaHeaderState = qtvUsers->header()->saveState();
}
if (g.talkingUI && g.talkingUI->isVisible()) {
// Save the TalkingUI's position if it is visible
// Note that we explicitly don't save the whole geometry as the TalkingUI's size
// is a flexible thing that'll adjust automatically anyways.
g.s.qpTalkingUI_Position = g.talkingUI->pos();
}
if (qwPTTButtonWidget) {
qwPTTButtonWidget->close();
qwPTTButtonWidget->deleteLater();

9
src/mumble/Settings.cpp
View File

@ -19,9 +19,15 @@
#include <boost/typeof/typeof.hpp>
#include <limits>
// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
#include "Global.h"
const QPoint Settings::UNSPECIFIED_POSITION = QPoint(std::numeric_limits<int>::min(), std::numeric_limits<int>::max());
bool Shortcut::isServerSpecific() const {
if (qvData.canConvert<ShortcutTarget>()) {
const ShortcutTarget &sc = qvariant_cast<ShortcutTarget> (qvData);
@ -461,6 +467,7 @@ Settings::Settings() {
bLog24HourClock = true;
iChatMessageMargins = 3;
qpTalkingUI_Position = UNSPECIFIED_POSITION;
bShowTalkingUI = false;
bTalkingUI_LocalUserStaysVisible = false;
bTalkingUI_AbbreviateChannelNames = true;
@ -835,6 +842,7 @@ void Settings::load(QSettings* settings_ptr) {
SAVELOAD(bDisablePublicList, "ui/disablepubliclist");
// TalkingUI
SAVELOAD(qpTalkingUI_Position, "ui/talkingUIPosition");
SAVELOAD(bShowTalkingUI, "ui/showTalkingUI");
SAVELOAD(bTalkingUI_LocalUserStaysVisible, "ui/talkingUI_LocalUserStaysVisible");
SAVELOAD(bTalkingUI_AbbreviateChannelNames, "ui/talkingUI_AbbreviateChannelNames");
@ -1191,6 +1199,7 @@ void Settings::save() {
SAVELOAD(bDisablePublicList, "ui/disablepubliclist");
// TalkingUI
SAVELOAD(qpTalkingUI_Position, "ui/talkingUIPosition");
SAVELOAD(bShowTalkingUI, "ui/showTalkingUI");
SAVELOAD(bTalkingUI_LocalUserStaysVisible, "ui/talkingUI_LocalUserStaysVisible");
SAVELOAD(bTalkingUI_AbbreviateChannelNames, "ui/talkingUI_AbbreviateChannelNames");

2
src/mumble/Settings.h
View File

@ -278,6 +278,8 @@ struct Settings {
bool bLog24HourClock;
int iChatMessageMargins;
static const QPoint UNSPECIFIED_POSITION;
QPoint qpTalkingUI_Position;
bool bShowTalkingUI;
bool bTalkingUI_LocalUserStaysVisible;
bool bTalkingUI_AbbreviateChannelNames;

11
src/mumble/main.cpp
View File

@ -509,6 +509,17 @@ int main(int argc, char **argv) {
g.mw->show();
g.talkingUI = new TalkingUI();
if (g.s.qpTalkingUI_Position != Settings::UNSPECIFIED_POSITION) {
// Restore last position
g.talkingUI->move(g.s.qpTalkingUI_Position);
} else {
// Place the TalkingUI next to the MainWindow by default by default
const QPoint mainWindowPos = g.mw->pos();
const int horizontalBuffer = 10;
g.talkingUI->move(mainWindowPos.x() + g.mw->size().width() + horizontalBuffer, mainWindowPos.y());
}
// By setting the TalkingUI's position **before** making it visible tends to more reliably include the
// window's frame to be included in the positioning calculation on X11 (at least using KDE Plasma)
g.talkingUI->setVisible(g.s.bShowTalkingUI);
QObject::connect(g.mw, &MainWindow::serverSynchronized, g.talkingUI, &TalkingUI::on_serverSynchronized);