aboutsummaryrefslogtreecommitdiff
path: root/src/IconBar.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/IconBar.cc')
-rw-r--r--src/IconBar.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/IconBar.cc b/src/IconBar.cc
index d6e6d88..03c8e85 100644
--- a/src/IconBar.cc
+++ b/src/IconBar.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: IconBar.cc,v 1.33 2003/05/10 22:55:10 fluxgen Exp $ 22// $Id: IconBar.cc,v 1.34 2003/05/15 11:17:27 fluxgen Exp $
23 23
24#include "IconBar.hh" 24#include "IconBar.hh"
25 25
@@ -29,6 +29,7 @@
29#include "ImageControl.hh" 29#include "ImageControl.hh"
30#include "Text.hh" 30#include "Text.hh"
31#include "RootTheme.hh" 31#include "RootTheme.hh"
32#include "FbWinFrameTheme.hh"
32 33
33#include <algorithm> 34#include <algorithm>
34 35
@@ -321,7 +322,7 @@ void IconBar::draw(const IconBarObj * const obj, int width) const {
321 unsigned int title_text_w; 322 unsigned int title_text_w;
322 323
323 title_text_w = m_font.textWidth( 324 title_text_w = m_font.textWidth(
324 fluxboxwin->getIconTitle().c_str(), fluxboxwin->getIconTitle().size()); 325 fluxboxwin->iconTitle().c_str(), fluxboxwin->iconTitle().size());
325 326
326 unsigned int bevel_w = screen().rootTheme().bevelWidth(); 327 unsigned int bevel_w = screen().rootTheme().bevelWidth();
327 int dx=bevel_w*2; 328 int dx=bevel_w*2;
@@ -330,8 +331,8 @@ void IconBar::draw(const IconBarObj * const obj, int width) const {
330 unsigned int newlen = 0; 331 unsigned int newlen = 0;
331 dx = FbTk::doAlignment(m_vertical ? obj->height() : obj->width(), 332 dx = FbTk::doAlignment(m_vertical ? obj->height() : obj->width(),
332 bevel_w*2, FbTk::CENTER, m_font, 333 bevel_w*2, FbTk::CENTER, m_font,
333 fluxboxwin->getIconTitle().c_str(), 334 fluxboxwin->iconTitle().c_str(),
334 fluxboxwin->getIconTitle().size(), 335 fluxboxwin->iconTitle().size(),
335 newlen); 336 newlen);
336 //Draw title to m_iconwin 337 //Draw title to m_iconwin
337 338
@@ -348,7 +349,7 @@ void IconBar::draw(const IconBarObj * const obj, int width) const {
348 iconwin, 349 iconwin,
349 screen().getScreenNumber(), 350 screen().getScreenNumber(),
350 screen().winFrameTheme().labelTextFocusGC(), 351 screen().winFrameTheme().labelTextFocusGC(),
351 fluxboxwin->getIconTitle().c_str(), newlen, 352 fluxboxwin->iconTitle().c_str(), newlen,
352 dx, dy, m_vertical); 353 dx, dy, m_vertical);
353 354
354} 355}