ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Work around a couple of Linux issues

This commit is contained in:
Stenzek 2024-10-19 12:44:07 +10:00
parent 76208f5f2d
commit f83cbbda12
No known key found for this signature in database
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/duckstation-qt/debuggerwindow.cpp
View File

@ -467,7 +467,13 @@ void DebuggerWindow::setupAdditionalUi()
fixedFont.setStyleHint(QFont::TypeWriter);
fixedFont.setPointSize(10);
#else
const QFont fixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
QFont fixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
#ifdef __linux__
// Fonts on Linux tend to be wider, so reduce the size.
// Otherwise the memory view gets cut off.
fixedFont.setPointSize(9);
#endif
#endif
m_ui.codeView->setFont(fixedFont);
m_ui.registerView->setFont(fixedFont);

21
src/duckstation-qt/mainwindow.cpp
View File

@ -749,8 +749,11 @@ void MainWindow::recreate()
// Recreate log window as well. Then make sure we're still on top.
LogWindow::updateSettings();
new_main_window->raise();
new_main_window->activateWindow();
// Qt+XCB will ignore the raise request of the settings window if we raise the main window.
// So skip that if we're going to be re-opening the settings window.
if (!settings_window_pos.has_value())
QtUtils::ShowOrRaiseWindow(new_main_window);
// Reload the sources we just closed.
g_emu_thread->reloadInputSources();
@ -762,18 +765,18 @@ void MainWindow::recreate()
g_main_window->onFullscreenUIStateChange(g_emu_thread->isRunningFullscreenUI());
}
if (settings_window_pos.has_value())
{
SettingsWindow* dlg = g_main_window->getSettingsWindow();
dlg->move(settings_window_pos.value());
dlg->setCategoryRow(settings_window_row);
QtUtils::ShowOrRaiseWindow(dlg);
}
if (controller_settings_window_pos.has_value())
{
ControllerSettingsWindow* dlg = g_main_window->getControllerSettingsWindow();
dlg->move(controller_settings_window_pos.value());
dlg->setCategory(controller_settings_window_row);
dlg->show();
}
if (settings_window_pos.has_value())
{
SettingsWindow* dlg = g_main_window->getSettingsWindow();
dlg->move(settings_window_pos.value());
dlg->setCategoryRow(settings_window_row);
QtUtils::ShowOrRaiseWindow(dlg);
}
}