summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-11-18 18:32:01 -0500
committerGravatar bunnei2014-11-18 18:32:01 -0500
commit40acd63631eeaca248b2393cde399714a730214f (patch)
treef87fe583cad412012a034665a5269567f008cf4d /src/citra_qt/main.cpp
parentMerge pull request #207 from lioncash/docs (diff)
parentcitra GLFW: Ignore minimal window size hints. (diff)
downloadyuzu-40acd63631eeaca248b2393cde399714a730214f.tar.gz
yuzu-40acd63631eeaca248b2393cde399714a730214f.tar.xz
yuzu-40acd63631eeaca248b2393cde399714a730214f.zip
Merge pull request #165 from neobrain/viewport-scaling
Stretch emulation output to render window and be display density independent
Diffstat (limited to 'src/citra_qt/main.cpp')
-rw-r--r--src/citra_qt/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 9a4e36adf..d5554d917 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -117,7 +117,8 @@ GMainWindow::GMainWindow()
117 connect(GetHotkey("Main Window", "Load File", this), SIGNAL(activated()), this, SLOT(OnMenuLoadFile())); 117 connect(GetHotkey("Main Window", "Load File", this), SIGNAL(activated()), this, SLOT(OnMenuLoadFile()));
118 connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this, SLOT(OnStartGame())); 118 connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this, SLOT(OnStartGame()));
119 119
120 setWindowTitle(render_window->GetWindowTitle().c_str()); 120 std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc);
121 setWindowTitle(window_title.c_str());
121 122
122 show(); 123 show();
123 124