Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-29 13:27:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 50

Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway.

Browse source
This commit is contained in:
cc9cii 2014-09-17 06:29:11 +10:00
parent e3da37567b
commit cb15750e40
4 changed files with 24 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/opencs/editor.cpp
View file

@ -283,9 +283,7 @@ std::auto_ptr<sh::Factory> CS::Editor::setupGraphics()
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
params.insert(std::make_pair("macAPI", "cocoa"));
#endif
// FIXME: don't apply the fullscreen here, apply to the editor window
//bool fullscreen = mUserSettings.settingValue("Video/fullscreen").toStdString() == "true" ? true : false;
//Ogre::RenderWindow* hiddenWindow = Ogre::Root::getSingleton().createRenderWindow("InactiveHidden", 1, 1, fullscreen, &params);
// NOTE: fullscreen mode not supported (doesn't really make sense for opencs)
Ogre::RenderWindow* hiddenWindow = Ogre::Root::getSingleton().createRenderWindow("InactiveHidden", 1, 1, false, &params);
hiddenWindow->setActive(false);

33
apps/opencs/view/settings/settingsdialog.cpp
View file

@ -164,7 +164,6 @@ CSVSettings::SettingsDialog::SettingsDialog(QTabWidget *parent)
spinBox_y->setMaximum(res.height());
connect(comboBox_rendersystem, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(rendererChanged(const QString&)));
connect(checkBox_fullscreen, SIGNAL(stateChanged(int)), this, SLOT(slotFullScreenChanged(int)));
connect(radioButton_standard_res, SIGNAL(toggled(bool)), this, SLOT(slotStandardToggled(bool)));
}
@ -174,27 +173,6 @@ void CSVSettings::SettingsDialog::rendererChanged()
comboBox_antialiasing->addItems(getAvailableOptions(QString("FSAA")));
}
void CSVSettings::SettingsDialog::slotFullScreenChanged(int state)
{
if (state == Qt::Checked) {
label_Resolution->setEnabled(false);
radioButton_standard_res->setEnabled(false);
radioButton_custom_res->setEnabled(false);
comboBox_std_window_size->setEnabled(false);
spinBox_x->setEnabled(false);
spinBox_y->setEnabled(false);
}
else
{
label_Resolution->setEnabled(true);
radioButton_standard_res->setEnabled(true);
radioButton_custom_res->setEnabled(true);
comboBox_std_window_size->setEnabled(true);
spinBox_x->setEnabled(true);
spinBox_y->setEnabled(true);
}
}
// FIXME: what to do with updating window size
void CSVSettings::SettingsDialog::slotStandardToggled(bool checked)
{
@ -254,17 +232,6 @@ void CSVSettings::SettingsDialog::setViewValues()
comboBox_std_window_size->setCurrentIndex(index);
slotStandardToggled(radioButton_standard_res->isChecked() ? true : false);
if(CSMSettings::UserSettings::instance().settingValue("Video/fullscreen") == "true")
{
checkBox_fullscreen->setChecked(true);
slotFullScreenChanged(Qt::Checked);
}
else
{
checkBox_fullscreen->setChecked(false);
slotFullScreenChanged(Qt::Unchecked);
}
}
void CSVSettings::SettingsDialog::closeEvent (QCloseEvent *event)

1
apps/opencs/view/settings/settingsdialog.hpp
View file

@ -37,7 +37,6 @@ namespace CSVSettings {
void show();
void rendererChanged();
void slotFullScreenChanged(int state);
void slotStandardToggled(bool checked);
};
}