diff options
Diffstat (limited to 'src/IconBar.cc')
-rw-r--r-- | src/IconBar.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/IconBar.cc b/src/IconBar.cc index 0da5a4e..392a84c 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.9 2002/02/04 22:43:15 fluxgen Exp $ | 22 | // $Id: IconBar.cc,v 1.10 2002/02/07 14:45:02 fluxgen Exp $ |
23 | 23 | ||
24 | #include "IconBar.hh" | 24 | #include "IconBar.hh" |
25 | #include "i18n.hh" | 25 | #include "i18n.hh" |
@@ -185,7 +185,7 @@ void IconBar::repositionIcons(void) { | |||
185 | unsigned int border_width, depth; //not used | 185 | unsigned int border_width, depth; //not used |
186 | int x, y; | 186 | int x, y; |
187 | XGetGeometry(m_display, m_parent, &root, &x, &y, &width, &height, | 187 | XGetGeometry(m_display, m_parent, &root, &x, &y, &width, &height, |
188 | &border_width, &depth); | 188 | &border_width, &depth); |
189 | 189 | ||
190 | //max width on every icon | 190 | //max width on every icon |
191 | unsigned int icon_width = width / m_iconlist.size(); | 191 | unsigned int icon_width = width / m_iconlist.size(); |
@@ -198,8 +198,8 @@ void IconBar::repositionIcons(void) { | |||
198 | for (x = 0; it != it_end; ++it, x += icon_width) { | 198 | for (x = 0; it != it_end; ++it, x += icon_width) { |
199 | Window iconwin = (*it)->getIconWin(); | 199 | Window iconwin = (*it)->getIconWin(); |
200 | XMoveResizeWindow(m_display, iconwin, | 200 | XMoveResizeWindow(m_display, iconwin, |
201 | x, 0, | 201 | x, 0, |
202 | icon_width, height); | 202 | icon_width, height); |
203 | draw((*it), icon_width); | 203 | draw((*it), icon_width); |
204 | decorate(iconwin); | 204 | decorate(iconwin); |
205 | } | 205 | } |
@@ -212,20 +212,20 @@ void IconBar::repositionIcons(void) { | |||
212 | //---------------------------------------------- | 212 | //---------------------------------------------- |
213 | Window IconBar::createIconWindow(FluxboxWindow *fluxboxwin, Window parent) { | 213 | Window IconBar::createIconWindow(FluxboxWindow *fluxboxwin, Window parent) { |
214 | unsigned long attrib_mask = CWBackPixmap | CWBackPixel | CWBorderPixel | | 214 | unsigned long attrib_mask = CWBackPixmap | CWBackPixel | CWBorderPixel | |
215 | CWColormap | CWOverrideRedirect | CWEventMask; | 215 | CWColormap | CWOverrideRedirect | CWEventMask; |
216 | XSetWindowAttributes attrib; | 216 | XSetWindowAttributes attrib; |
217 | attrib.background_pixmap = None; | 217 | attrib.background_pixmap = None; |
218 | attrib.background_pixel = attrib.border_pixel = | 218 | attrib.background_pixel = attrib.border_pixel = |
219 | fluxboxwin->getScreen()->getWindowStyle()->tab.border_color.getPixel(); | 219 | fluxboxwin->getScreen()->getWindowStyle()->tab.border_color.getPixel(); |
220 | attrib.colormap = fluxboxwin->getScreen()->getColormap(); | 220 | attrib.colormap = fluxboxwin->getScreen()->getColormap(); |
221 | attrib.override_redirect = True; | 221 | attrib.override_redirect = True; |
222 | attrib.event_mask = ButtonPressMask | ButtonReleaseMask | | 222 | attrib.event_mask = ButtonPressMask | ButtonReleaseMask | |
223 | ButtonMotionMask | ExposureMask | EnterWindowMask; | 223 | ButtonMotionMask | ExposureMask | EnterWindowMask; |
224 | 224 | ||
225 | //create iconwindow | 225 | //create iconwindow |
226 | Window iconwin = XCreateWindow(m_display, parent, 0, 0, 1, 1, 0, | 226 | Window iconwin = XCreateWindow(m_display, parent, 0, 0, 1, 1, 0, |
227 | fluxboxwin->getScreen()->getDepth(), InputOutput, fluxboxwin->getScreen()->getVisual(), | 227 | fluxboxwin->getScreen()->getDepth(), InputOutput, fluxboxwin->getScreen()->getVisual(), |
228 | attrib_mask, &attrib); | 228 | attrib_mask, &attrib); |
229 | 229 | ||
230 | return iconwin; | 230 | return iconwin; |
231 | } | 231 | } |