diff options
| author |  Tony Wasserka | 2014-11-13 18:17:39 +0100 |
|---|---|---|
| committer | Tony Wasserka | 2014-11-18 13:09:01 +0100 |
| commit | 182476c96a6c75e90a90cbb52048bf754fdd786d (patch) | |
| tree | c6ce8fc723e9c702a3bc3bf3c1a6788b6faee486 /src/citra | |
| 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')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 7e1e1c9a6..9e6f91578 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp | |||
| @@ -75,9 +75,10 @@ EmuWindow_GLFW::EmuWindow_GLFW() { | |||
| 75 | glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); | 75 | glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); |
| 76 | glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); | 76 | glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); |
| 77 | 77 | ||
| 78 | m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, | 78 | std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); |
| 79 | (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), | 79 | m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, |
| 80 | GetWindowTitle().c_str(), NULL, NULL); | 80 | (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), |
| 81 | window_title.c_str(), NULL, NULL); | ||
| 81 | 82 | ||
| 82 | if (m_render_window == NULL) { | 83 | if (m_render_window == NULL) { |
| 83 | printf("Failed to create GLFW window! Exiting..."); | 84 | printf("Failed to create GLFW window! Exiting..."); |