Browse Source

fixes

pull/353/head
lizzie 4 weeks ago
committed by Caio Oliveira
parent
commit
b0dccf4022
No known key found for this signature in database GPG Key ID: 362DA3DC1901E080
  1. 27
      src/yuzu/configuration/configure_general.ui
  2. 7
      src/yuzu/configuration/configure_per_game.cpp
  3. 11
      src/yuzu/main_window.cpp

27
src/yuzu/configuration/configure_general.ui

@ -46,33 +46,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="LinuxGroupBox">
<property name="title">
<string>Linux</string>
</property>
<layout class="QVBoxLayout" name="LinuxVerticalLayout_1">
<item>
<widget class="QWidget" name="linux_widget" native="true">
<layout class="QVBoxLayout" name="LinuxVerticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">

7
src/yuzu/configuration/configure_per_game.cpp

@ -82,13 +82,6 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
ui->tabWidget->addTab(input_tab.get(), tr("Input Profiles")); ui->tabWidget->addTab(input_tab.get(), tr("Input Profiles"));
ui->tabWidget->addTab(network_tab.get(), tr("Network")); ui->tabWidget->addTab(network_tab.get(), tr("Network"));
// Only show Linux tab on Unix
linux_tab->setVisible(false);
#ifdef __unix__
linux_tab->setVisible(true);
ui->tabWidget->addTab(linux_tab.get(), tr("Linux"));
#endif
setFocusPolicy(Qt::ClickFocus); setFocusPolicy(Qt::ClickFocus);
setWindowTitle(tr("Properties")); setWindowTitle(tr("Properties"));

11
src/yuzu/main_window.cpp

@ -2194,7 +2194,7 @@ void MainWindow::OnEmulationStopped() {
emulation_running = false; emulation_running = false;
discord_rpc->Update(); discord_rpc->Update();
Common::Linux::StopGamemode();
Common::FeralGamemode::Stop();
// The emulation is stopped, so closing the window or not does not matter anymore // The emulation is stopped, so closing the window or not does not matter anymore
disconnect(render_window, &GRenderWindow::Closed, this, &MainWindow::OnStopGame); disconnect(render_window, &GRenderWindow::Closed, this, &MainWindow::OnStopGame);
@ -3065,7 +3065,7 @@ void MainWindow::OnStartGame() {
play_time_manager->Start(); play_time_manager->Start();
discord_rpc->Update(); discord_rpc->Update();
Common::Linux::StartGamemode();
Common::FeralGamemode::Start();
} }
void MainWindow::OnRestartGame() { void MainWindow::OnRestartGame() {
@ -3086,7 +3086,7 @@ void MainWindow::OnPauseGame() {
play_time_manager->Stop(); play_time_manager->Stop();
UpdateMenuState(); UpdateMenuState();
AllowOSSleep(); AllowOSSleep();
Common::Linux::StopGamemode();
Common::FeralGamemode::Stop();
} }
void MainWindow::OnPauseContinueGame() { void MainWindow::OnPauseContinueGame() {
@ -4745,7 +4745,10 @@ void MainWindow::SetDiscordEnabled([[maybe_unused]] bool state) {
void MainWindow::SetGamemodeEnabled(bool state) { void MainWindow::SetGamemodeEnabled(bool state) {
if (emulation_running) { if (emulation_running) {
Common::Linux::SetGamemodeState(state);
if (state)
Common::FeralGamemode::Start();
else
Common::FeralGamemode::Stop();
} }
} }

Loading…
Cancel
Save