aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <machine.sanctum@gmail.com>2014-08-19 09:33:52 +0200
committerMartijn Kaijser <machine.sanctum@gmail.com>2014-08-19 09:33:52 +0200
commitf5b894bd1576ec6895041e286ae6f668afbaa4fa (patch)
treed1539c93535e5c527675a5d4fabf2a03ffb90884
parent9f7eff0bfff2b35d765d029cc527594270a9f3ce (diff)
parentb3c927289ac155c47d4c4ac8f2fdad18fa1c7f2a (diff)
Merge pull request #5234 from ronie/trac#15389
Add linebreak between cpu and videoclock info - fixes trac#15389
-rw-r--r--addons/skin.confluence/720p/VideoFullScreen.xml4
-rw-r--r--xbmc/video/windows/GUIWindowFullScreen.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml
index aeb565279c..a3bc7146ae 100644
--- a/addons/skin.confluence/720p/VideoFullScreen.xml
+++ b/addons/skin.confluence/720p/VideoFullScreen.xml
@@ -368,7 +368,7 @@
<left>0</left>
<top>0</top>
<width>1280</width>
- <height>140</height>
+ <height>155</height>
<texture>black-back.png</texture>
</control>
<control type="label" id="10">
@@ -398,7 +398,7 @@
<left>50</left>
<top>100</top>
<width>1180</width>
- <height>30</height>
+ <height>45</height>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp
index 69ac880759..87ba42c177 100644
--- a/xbmc/video/windows/GUIWindowFullScreen.cpp
+++ b/xbmc/video/windows/GUIWindowFullScreen.cpp
@@ -601,7 +601,7 @@ void CGUIWindowFullScreen::FrameMove()
, clockspeed - 100.0
, g_renderManager.GetVSyncState().c_str());
- strGeneralFPS = StringUtils::Format("%s\nW( fps:%02.2f %s ) %s"
+ strGeneralFPS = StringUtils::Format("%s\nW( fps:%02.2f %s )\n%s"
, strGeneral.c_str()
, g_infoManager.GetFPS()
, strCores.c_str(), strClock.c_str() );