indentation
This commit is contained in:
parent
43fd8e56ea
commit
5718180e6e
1 changed files with 14 additions and 14 deletions
|
@ -19,7 +19,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: IconBar.cc,v 1.9 2002/02/04 22:43:15 fluxgen Exp $
|
// $Id: IconBar.cc,v 1.10 2002/02/07 14:45:02 fluxgen Exp $
|
||||||
|
|
||||||
#include "IconBar.hh"
|
#include "IconBar.hh"
|
||||||
#include "i18n.hh"
|
#include "i18n.hh"
|
||||||
|
@ -185,7 +185,7 @@ void IconBar::repositionIcons(void) {
|
||||||
unsigned int border_width, depth; //not used
|
unsigned int border_width, depth; //not used
|
||||||
int x, y;
|
int x, y;
|
||||||
XGetGeometry(m_display, m_parent, &root, &x, &y, &width, &height,
|
XGetGeometry(m_display, m_parent, &root, &x, &y, &width, &height,
|
||||||
&border_width, &depth);
|
&border_width, &depth);
|
||||||
|
|
||||||
//max width on every icon
|
//max width on every icon
|
||||||
unsigned int icon_width = width / m_iconlist.size();
|
unsigned int icon_width = width / m_iconlist.size();
|
||||||
|
@ -198,8 +198,8 @@ void IconBar::repositionIcons(void) {
|
||||||
for (x = 0; it != it_end; ++it, x += icon_width) {
|
for (x = 0; it != it_end; ++it, x += icon_width) {
|
||||||
Window iconwin = (*it)->getIconWin();
|
Window iconwin = (*it)->getIconWin();
|
||||||
XMoveResizeWindow(m_display, iconwin,
|
XMoveResizeWindow(m_display, iconwin,
|
||||||
x, 0,
|
x, 0,
|
||||||
icon_width, height);
|
icon_width, height);
|
||||||
draw((*it), icon_width);
|
draw((*it), icon_width);
|
||||||
decorate(iconwin);
|
decorate(iconwin);
|
||||||
}
|
}
|
||||||
|
@ -212,20 +212,20 @@ void IconBar::repositionIcons(void) {
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
Window IconBar::createIconWindow(FluxboxWindow *fluxboxwin, Window parent) {
|
Window IconBar::createIconWindow(FluxboxWindow *fluxboxwin, Window parent) {
|
||||||
unsigned long attrib_mask = CWBackPixmap | CWBackPixel | CWBorderPixel |
|
unsigned long attrib_mask = CWBackPixmap | CWBackPixel | CWBorderPixel |
|
||||||
CWColormap | CWOverrideRedirect | CWEventMask;
|
CWColormap | CWOverrideRedirect | CWEventMask;
|
||||||
XSetWindowAttributes attrib;
|
XSetWindowAttributes attrib;
|
||||||
attrib.background_pixmap = None;
|
attrib.background_pixmap = None;
|
||||||
attrib.background_pixel = attrib.border_pixel =
|
attrib.background_pixel = attrib.border_pixel =
|
||||||
fluxboxwin->getScreen()->getWindowStyle()->tab.border_color.getPixel();
|
fluxboxwin->getScreen()->getWindowStyle()->tab.border_color.getPixel();
|
||||||
attrib.colormap = fluxboxwin->getScreen()->getColormap();
|
attrib.colormap = fluxboxwin->getScreen()->getColormap();
|
||||||
attrib.override_redirect = True;
|
attrib.override_redirect = True;
|
||||||
attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
|
attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
|
||||||
ButtonMotionMask | ExposureMask | EnterWindowMask;
|
ButtonMotionMask | ExposureMask | EnterWindowMask;
|
||||||
|
|
||||||
//create iconwindow
|
//create iconwindow
|
||||||
Window iconwin = XCreateWindow(m_display, parent, 0, 0, 1, 1, 0,
|
Window iconwin = XCreateWindow(m_display, parent, 0, 0, 1, 1, 0,
|
||||||
fluxboxwin->getScreen()->getDepth(), InputOutput, fluxboxwin->getScreen()->getVisual(),
|
fluxboxwin->getScreen()->getDepth(), InputOutput, fluxboxwin->getScreen()->getVisual(),
|
||||||
attrib_mask, &attrib);
|
attrib_mask, &attrib);
|
||||||
|
|
||||||
return iconwin;
|
return iconwin;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue