diff options
| author | 2014-11-13 18:17:39 +0100 | |
|---|---|---|
| committer | 2014-11-18 13:09:01 +0100 | |
| commit | 182476c96a6c75e90a90cbb52048bf754fdd786d (patch) | |
| tree | c6ce8fc723e9c702a3bc3bf3c1a6788b6faee486 /src/citra_qt/bootmanager.cpp | |
| parent | EmuWindow: Add documentation. (diff) | |
| download | yuzu-182476c96a6c75e90a90cbb52048bf754fdd786d.tar.gz yuzu-182476c96a6c75e90a90cbb52048bf754fdd786d.tar.xz yuzu-182476c96a6c75e90a90cbb52048bf754fdd786d.zip | |
EmuWindow: Remove window title getters/setters.
The window title is none of the emulation core's business. The GUI code is free to put whatever it wants there.
Providing properly thread-safe window title getters and setters is a mess anyway.
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 8c12cb228..ace48a237 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -111,6 +111,9 @@ EmuThread& GRenderWindow::GetEmuThread() | |||
| 111 | 111 | ||
| 112 | GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this), keyboard_id(0) | 112 | GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this), keyboard_id(0) |
| 113 | { | 113 | { |
| 114 | std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); | ||
| 115 | setWindowTitle(QString::fromStdString(window_title)); | ||
| 116 | |||
| 114 | keyboard_id = KeyMap::NewDeviceId(); | 117 | keyboard_id = KeyMap::NewDeviceId(); |
| 115 | ReloadSetKeymaps(); | 118 | ReloadSetKeymaps(); |
| 116 | 119 | ||
| @@ -182,14 +185,6 @@ void GRenderWindow::DoneCurrent() | |||
| 182 | } | 185 | } |
| 183 | 186 | ||
| 184 | void GRenderWindow::PollEvents() { | 187 | void GRenderWindow::PollEvents() { |
| 185 | // TODO(ShizZy): Does this belong here? This is a reasonable place to update the window title | ||
| 186 | // from the main thread, but this should probably be in an event handler... | ||
| 187 | /* | ||
| 188 | static char title[128]; | ||
| 189 | sprintf(title, "%s (FPS: %02.02f)", window_title_.c_str(), | ||
| 190 | video_core::g_renderer->current_fps()); | ||
| 191 | setWindowTitle(title); | ||
| 192 | */ | ||
| 193 | } | 188 | } |
| 194 | 189 | ||
| 195 | // On Qt 5.0+, this correctly gets the size of the framebuffer (pixels). | 190 | // On Qt 5.0+, this correctly gets the size of the framebuffer (pixels). |