diff options
author | Mathias Gumz <akira@fluxbox.org> | 2015-01-03 20:45:14 (GMT) |
---|---|---|
committer | Mathias Gumz <akira@fluxbox.org> | 2015-01-03 20:45:14 (GMT) |
commit | 90f2fcf031554577ce811e7f7151f2a78ea7a265 (patch) | |
tree | 3705ddd022d4b6c8e859e17a8858cf602617b8ec /src/Screen.cc | |
parent | 3c85ace912824df11ccb22666085e9ba84cd00be (diff) | |
download | fluxbox-90f2fcf031554577ce811e7f7151f2a78ea7a265.zip fluxbox-90f2fcf031554577ce811e7f7151f2a78ea7a265.tar.bz2 |
Minor API change for OSDWindow
OSDWindow::resize(const FbTk::BiDiString&) shadowed FbWindow::resize(x, y). To
fix this I renamed the function to OSDWindow::resizeForText() to make the
intention clear.
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 29ab548..1a42f33 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1900,19 +1900,18 @@ void BScreen::renderGeomWindow() { | |||
1900 | char buf[256]; | 1900 | char buf[256]; |
1901 | _FB_USES_NLS; | 1901 | _FB_USES_NLS; |
1902 | 1902 | ||
1903 | sprintf(buf, | 1903 | const std::string msg = _FB_XTEXT(Screen, GeometrySpacing, |
1904 | _FB_XTEXT(Screen, GeometrySpacing, | 1904 | "W: %04d x H: %04d", "Representative maximum sized text for width and height dialog"); |
1905 | "W: %04d x H: %04d", "Representative maximum sized text for width and height dialog").c_str(), | 1905 | const int n = snprintf(buf, msg.size(), msg.c_str(), 0, 0); |
1906 | 0, 0); | ||
1907 | 1906 | ||
1908 | FbTk::BiDiString label(buf); | 1907 | FbTk::BiDiString label(std::string(buf, n)); |
1909 | m_geom_window->resize(label); | 1908 | m_geom_window->resizeForText(label); |
1910 | m_geom_window->reconfigTheme(); | 1909 | m_geom_window->reconfigTheme(); |
1911 | } | 1910 | } |
1912 | 1911 | ||
1913 | 1912 | ||
1914 | void BScreen::renderPosWindow() { | 1913 | void BScreen::renderPosWindow() { |
1915 | m_pos_window->resize(FbTk::BiDiString("0:00000 x 0:00000")); | 1914 | m_pos_window->resizeForText(FbTk::BiDiString("0:00000 x 0:00000")); |
1916 | m_pos_window->reconfigTheme(); | 1915 | m_pos_window->reconfigTheme(); |
1917 | } | 1916 | } |
1918 | 1917 | ||