aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakir <akir>2004-10-10 16:11:25 (GMT)
committerakir <akir>2004-10-10 16:11:25 (GMT)
commitdf9ddbbae8a6f535b8c0c4b0d2756a5a99622995 (patch)
tree07d89d1b06a963e661b1671b8816db2ade8c6d67
parentd30e16f159efa7bde19dd01e560794b43dea6620 (diff)
downloadfluxbox_pavel-df9ddbbae8a6f535b8c0c4b0d2756a5a99622995.zip
fluxbox_pavel-df9ddbbae8a6f535b8c0c4b0d2756a5a99622995.tar.bz2
added iconbar.iconTextPadding
-rw-r--r--src/IconbarTool.cc5
-rw-r--r--src/IconbarTool.hh3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index ac974c5..066b87d 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: IconbarTool.cc,v 1.47 2004/10/10 12:00:37 rathnor Exp $ 23// $Id: IconbarTool.cc,v 1.48 2004/10/10 16:11:25 akir Exp $
24 24
25#include "IconbarTool.hh" 25#include "IconbarTool.hh"
26 26
@@ -279,6 +279,8 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, BScr
279 screen.name() + ".iconbar.alignment", screen.altName() + ".Iconbar.Alignment"), 279 screen.name() + ".iconbar.alignment", screen.altName() + ".Iconbar.Alignment"),
280 m_rc_client_width(screen.resourceManager(), 70, 280 m_rc_client_width(screen.resourceManager(), 70,
281 screen.name() + ".iconbar.iconWidth", screen.altName() + ".Iconbar.IconWidth"), 281 screen.name() + ".iconbar.iconWidth", screen.altName() + ".Iconbar.IconWidth"),
282 m_rc_client_padding(screen.resourceManager(), 10,
283 screen.name() + ".iconbar.iconTextPadding", screen.altName() + ".Iconbar.IconTextPadding"),
282 m_rc_use_pixmap(screen.resourceManager(), true, 284 m_rc_use_pixmap(screen.resourceManager(), true,
283 screen.name() + ".iconbar.usePixmap", screen.altName() + ".Iconbar.UsePixmap"), 285 screen.name() + ".iconbar.usePixmap", screen.altName() + ".Iconbar.UsePixmap"),
284 m_menu(screen.menuTheme(), screen.imageControl(), 286 m_menu(screen.menuTheme(), screen.imageControl(),
@@ -734,6 +736,7 @@ void IconbarTool::addWindow(FluxboxWindow &win) {
734 cerr<<"IconbarTool::addWindow(0x"<<&win<<" title = "<<win.title()<<")"<<endl; 736 cerr<<"IconbarTool::addWindow(0x"<<&win<<" title = "<<win.title()<<")"<<endl;
735#endif // DEBUG 737#endif // DEBUG
736 IconButton *button = new IconButton(m_icon_container, m_theme.focusedText().font(), win); 738 IconButton *button = new IconButton(m_icon_container, m_theme.focusedText().font(), win);
739 button->setTextPadding(*m_rc_client_padding);
737 740
738 renderButton(*button, false); // update the attributes, but don't clear it 741 renderButton(*button, false); // update the attributes, but don't clear it
739 m_icon_container.insertItem(button); 742 m_icon_container.insertItem(button);
diff --git a/src/IconbarTool.hh b/src/IconbarTool.hh
index e9036e7..af1ba37 100644
--- a/src/IconbarTool.hh
+++ b/src/IconbarTool.hh
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: IconbarTool.hh,v 1.16 2004/09/12 14:56:18 rathnor Exp $ 23// $Id: IconbarTool.hh,v 1.17 2004/10/10 16:11:25 akir Exp $
24 24
25#ifndef ICONBARTOOL_HH 25#ifndef ICONBARTOOL_HH
26#define ICONBARTOOL_HH 26#define ICONBARTOOL_HH
@@ -119,6 +119,7 @@ private:
119 FbTk::Resource<Mode> m_rc_mode; 119 FbTk::Resource<Mode> m_rc_mode;
120 FbTk::Resource<Container::Alignment> m_rc_alignment; ///< alignment of buttons 120 FbTk::Resource<Container::Alignment> m_rc_alignment; ///< alignment of buttons
121 FbTk::Resource<int> m_rc_client_width; ///< size of client button in LEFT/RIGHT mode 121 FbTk::Resource<int> m_rc_client_width; ///< size of client button in LEFT/RIGHT mode
122 FbTk::Resource<unsigned int> m_rc_client_padding; ///< padding of the text
122 FbTk::Resource<bool> m_rc_use_pixmap; ///< if iconbar should use win pixmap or not 123 FbTk::Resource<bool> m_rc_use_pixmap; ///< if iconbar should use win pixmap or not
123 FbTk::Timer m_focus_timer; ///< so we can update current window without flicker while changing attached clients 124 FbTk::Timer m_focus_timer; ///< so we can update current window without flicker while changing attached clients
124 FbMenu m_menu; 125 FbMenu m_menu;