diff options
| author | 2014-11-13 18:17:39 +0100 | |
|---|---|---|
| committer | 2014-11-18 13:09:01 +0100 | |
| commit | 182476c96a6c75e90a90cbb52048bf754fdd786d (patch) | |
| tree | c6ce8fc723e9c702a3bc3bf3c1a6788b6faee486 /src/common/emu_window.h | |
| 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/common/emu_window.h')
| -rw-r--r-- | src/common/emu_window.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h index 1465743f2..3817a7734 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h | |||
| @@ -89,20 +89,8 @@ public: | |||
| 89 | return std::make_pair(client_area_width, client_area_height); | 89 | return std::make_pair(client_area_width, client_area_height); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | // TODO: Remove | ||
| 93 | std::string GetWindowTitle() const { | ||
| 94 | return window_title; | ||
| 95 | } | ||
| 96 | |||
| 97 | // TODO: Remove | ||
| 98 | void SetWindowTitle(const std::string& val) { | ||
| 99 | window_title = val; | ||
| 100 | } | ||
| 101 | |||
| 102 | protected: | 92 | protected: |
| 103 | // TODO: Remove window title initialization | 93 | EmuWindow() |
| 104 | EmuWindow() : | ||
| 105 | window_title(Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc)) | ||
| 106 | { | 94 | { |
| 107 | // TODO | 95 | // TODO |
| 108 | config.min_client_area_size = std::make_pair(300u, 500u); | 96 | config.min_client_area_size = std::make_pair(300u, 500u); |
| @@ -145,9 +133,6 @@ private: | |||
| 145 | virtual void OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) { | 133 | virtual void OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) { |
| 146 | } | 134 | } |
| 147 | 135 | ||
| 148 | // TODO: Remove | ||
| 149 | std::string window_title; ///< Current window title, should be used by window impl. | ||
| 150 | |||
| 151 | std::pair<unsigned,unsigned> framebuffer_size; | 136 | std::pair<unsigned,unsigned> framebuffer_size; |
| 152 | 137 | ||
| 153 | unsigned client_area_width; ///< Current client width, should be set by window impl. | 138 | unsigned client_area_width; ///< Current client width, should be set by window impl. |