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

Compare commits

base: nilix:main
Branches Tags
nilix:main
nilix:master
..
compare: nilix:master
Branches Tags
nilix:main
nilix:master

No commits in common. "main" and "master" have entirely different histories.
main ... master

2 changed files with 2 additions and 14 deletions
Show stats Expand all files Collapse all files

14
src/FbTk/FbWindow.cc
View file

@ -252,19 +252,7 @@ void FbWindow::updateBackground(bool only_if_alpha) {
}
void FbWindow::setBorderColor(const FbTk::Color &border_color) {
unsigned long pixel = border_color.pixel();
XWindowAttributes attr;
if (XGetWindowAttributes(display(), m_window, &attr)
&& attr.colormap != DefaultColormap(display(), m_screen_num)) {
XColor color;
color.red = border_color.red() * 0x101;
color.green = border_color.green() * 0x101;
color.blue = border_color.blue() * 0x101;
if (XAllocColor(display(), attr.colormap, &color)){
pixel = color.pixel;
}
}
XSetWindowBorder(display(), m_window, pixel);
XSetWindowBorder(display(), m_window, border_color.pixel());
m_border_color = border_color.pixel();
}

2
src/WindowState.cc
View file

@ -40,7 +40,7 @@ bool WindowState::useTabs() const {
}
bool WindowState::useTitlebar() const {
return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_TITLEBAR;
return !fullscreen && deco_mask & DECORM_TITLEBAR;
}
void WindowState::saveGeometry(int new_x, int new_y,