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

fix rounded corners on restart

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-09-25 20:51:37 -07:00
parent 4018d08818
commit bb70b14432
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day)
Changes for 1.1.2
*08/09/25:
* Fixed issues with round corners on restart, #2110455 (Mark)
FbTk/Shape.cc
*08/09/21:
* Changed icon list signal in BScreen to use the new signal system
(Henrik)

7
src/FbTk/Shape.cc
View file

@ -56,9 +56,9 @@ Pixmap makePixmap(FbWindow &drawable, const unsigned char rows[]) {
Display *disp = App::instance()->display();
const size_t data_size = 8 * 8;
// we use calloc here so we get consistent C alloc/free with XDestroyImage
// we use malloc here so we get consistent C alloc/free with XDestroyImage
// and no warnings in valgrind :)
char *data = (char *)calloc(data_size, sizeof (char));
char *data = (char *)malloc(data_size * sizeof (char));
if (data == 0)
return 0;
@ -141,6 +141,9 @@ Shape::~Shape() {
}
void Shape::initCorners(int screen_num) {
if (!m_win->window())
return;
if (s_corners.size() == 0)
s_corners.resize(ScreenCount(App::instance()->display()));

3
src/Screen.cc
View file

@ -1557,7 +1557,8 @@ void BScreen::removeConfigMenu(FbTk::Menu &menu) {
if (erase_it != m_configmenu_list.end())
m_configmenu_list.erase(erase_it);
setupConfigmenu(*m_configmenu.get());
if (!isShuttingdown())
setupConfigmenu(*m_configmenu.get());
}