diff options
author | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-05-09 17:39:02 (GMT) |
---|---|---|
committer | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-05-09 17:39:02 (GMT) |
commit | c31638038aabd93c74373c7ee00fbefbc68d28ae (patch) | |
tree | da658ad65f64c24495cfdc169449250efb5caac0 /src/Screen.hh | |
parent | 05fa2be09642ff135eb32a4528103adf89cd71e7 (diff) | |
download | fluxbox_pavel-c31638038aabd93c74373c7ee00fbefbc68d28ae.zip fluxbox_pavel-c31638038aabd93c74373c7ee00fbefbc68d28ae.tar.bz2 |
Fixed so tooltip window in the iconbar when the title changes.
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index cf8bf1f..02fcc0d 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -64,6 +64,8 @@ class Toolbar; | |||
64 | class HeadArea; | 64 | class HeadArea; |
65 | class FocusControl; | 65 | class FocusControl; |
66 | class ScreenPlacement; | 66 | class ScreenPlacement; |
67 | class TooltipWindow; | ||
68 | class OSDWindow; | ||
67 | 69 | ||
68 | namespace FbTk { | 70 | namespace FbTk { |
69 | class Menu; | 71 | class Menu; |
@@ -73,6 +75,7 @@ class FbWindow; | |||
73 | class Subject; | 75 | class Subject; |
74 | } | 76 | } |
75 | 77 | ||
78 | |||
76 | /// Handles screen connection, screen clients and workspaces | 79 | /// Handles screen connection, screen clients and workspaces |
77 | /** | 80 | /** |
78 | Create workspaces, handles switching between workspaces and windows | 81 | Create workspaces, handles switching between workspaces and windows |
@@ -389,10 +392,14 @@ public: | |||
389 | /// show geomentry with "width x height"-text, not size of window | 392 | /// show geomentry with "width x height"-text, not size of window |
390 | void showGeometry(int width, int height); | 393 | void showGeometry(int width, int height); |
391 | void hideGeometry(); | 394 | void hideGeometry(); |
392 | 395 | ||
396 | /// @param text the text to be displayed in the tooltip window | ||
393 | void showTooltip(const std::string &text); | 397 | void showTooltip(const std::string &text); |
398 | /// Hides the tooltip window | ||
394 | void hideTooltip(); | 399 | void hideTooltip(); |
395 | 400 | ||
401 | TooltipWindow& tooltipWindow() { return *m_tooltip_window; } | ||
402 | |||
396 | void setLayer(FbTk::XLayerItem &item, int layernum); | 403 | void setLayer(FbTk::XLayerItem &item, int layernum); |
397 | // remove? no, items are never removed from their layer until they die | 404 | // remove? no, items are never removed from their layer until they die |
398 | 405 | ||
@@ -538,8 +545,8 @@ private: | |||
538 | std::auto_ptr<RootTheme> m_root_theme; | 545 | std::auto_ptr<RootTheme> m_root_theme; |
539 | 546 | ||
540 | FbRootWindow m_root_window; | 547 | FbRootWindow m_root_window; |
541 | OSDWindow m_geom_window, m_pos_window; | 548 | std::auto_ptr<OSDWindow> m_geom_window, m_pos_window; |
542 | TooltipWindow m_tooltip_window; | 549 | std::auto_ptr<TooltipWindow> m_tooltip_window; |
543 | FbTk::FbWindow m_dummy_window; | 550 | FbTk::FbWindow m_dummy_window; |
544 | 551 | ||
545 | struct ScreenResource { | 552 | struct ScreenResource { |