nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated BColor function names

Browse source
This commit is contained in:
fluxgen 2002-07-19 21:18:29 +00:00
parent 650924679a
commit abe8ed2968
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Basemenu.cc
View file

@ -22,7 +22,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: Basemenu.cc,v 1.25 2002/05/29 21:15:07 fluxgen Exp $ // $Id: Basemenu.cc,v 1.26 2002/07/19 21:18:29 fluxgen Exp $
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -124,8 +124,8 @@ m_alignment(ALIGNDONTCARE) {
XSetWindowAttributes attrib; XSetWindowAttributes attrib;
attrib.background_pixmap = None; attrib.background_pixmap = None;
attrib.background_pixel = attrib.border_pixel = attrib.background_pixel = attrib.border_pixel =
m_screen->getBorderColor()->getPixel(); m_screen->getBorderColor()->pixel();
attrib.colormap = m_screen->getColormap(); attrib.colormap = m_screen->colormap();
attrib.override_redirect = True; attrib.override_redirect = True;
attrib.event_mask = ButtonPressMask | ButtonReleaseMask | attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | ExposureMask; ButtonMotionMask | ExposureMask;
@ -140,7 +140,7 @@ m_alignment(ALIGNDONTCARE) {
//attibutes for title to menuwindow //attibutes for title to menuwindow
attrib_mask = CWBackPixmap | CWBackPixel | CWBorderPixel | CWEventMask; attrib_mask = CWBackPixmap | CWBackPixel | CWBorderPixel | CWEventMask;
attrib.background_pixel = m_screen->getBorderColor()->getPixel(); attrib.background_pixel = m_screen->getBorderColor()->pixel();
attrib.event_mask |= EnterWindowMask | LeaveWindowMask; attrib.event_mask |= EnterWindowMask | LeaveWindowMask;
//create menu title //create menu title
menu.title = menu.title =
@ -351,7 +351,7 @@ void Basemenu::update(void) {
if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
menu.title_pixmap = None; menu.title_pixmap = None;
XSetWindowBackground(m_display, menu.title, XSetWindowBackground(m_display, menu.title,
texture->getColor()->getPixel()); texture->color().pixel());
} else { } else {
menu.title_pixmap = menu.title_pixmap =
m_image_ctrl->renderImage(menu.width, menu.title_h, texture); m_image_ctrl->renderImage(menu.width, menu.title_h, texture);
@ -366,7 +366,7 @@ void Basemenu::update(void) {
if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
menu.frame_pixmap = None; menu.frame_pixmap = None;
XSetWindowBackground(m_display, menu.frame, XSetWindowBackground(m_display, menu.frame,
texture->getColor()->getPixel()); texture->color().pixel());
} else { } else {
menu.frame_pixmap = menu.frame_pixmap =
m_image_ctrl->renderImage(menu.width, menu.frame_h, texture); m_image_ctrl->renderImage(menu.width, menu.frame_h, texture);
@ -1120,9 +1120,9 @@ void Basemenu::leaveNotifyEvent(XCrossingEvent *ce) {
void Basemenu::reconfigure(void) { void Basemenu::reconfigure(void) {
XSetWindowBackground(m_display, menu.window, XSetWindowBackground(m_display, menu.window,
m_screen->getBorderColor()->getPixel()); m_screen->getBorderColor()->pixel());
XSetWindowBorder(m_display, menu.window, XSetWindowBorder(m_display, menu.window,
m_screen->getBorderColor()->getPixel()); m_screen->getBorderColor()->pixel());
XSetWindowBorderWidth(m_display, menu.window, m_screen->getBorderWidth()); XSetWindowBorderWidth(m_display, menu.window, m_screen->getBorderWidth());
menu.bevel_w = m_screen->getBevelWidth(); menu.bevel_w = m_screen->getBevelWidth();