Fixed compilatin, reverted several of my changes

Conflicts:
	src/gfx.cpp
	src/widget.cpp
	src/widget_type.h
	src/window.cpp
	src/window_func.h
This commit is contained in:
pelya
2015-03-29 22:37:58 +03:00
parent 3ef1c1baff
commit 400065fa43
8 changed files with 23 additions and 53 deletions

View File

@@ -1417,9 +1417,11 @@ public:
}
}
if (type == NWID_HORIZONTAL) {
w->window_desc->default_width = nbuttons * this->smallest_x;
//w->window_desc->default_width_trad = nbuttons * this->smallest_x;
w->window_desc->pref_width = nbuttons * this->smallest_x;
} else {
w->window_desc->default_height = nbuttons * this->smallest_y;
//w->window_desc->default_height_trad = nbuttons * this->smallest_y;
w->window_desc->pref_height = nbuttons * this->smallest_y;
}
_toolbar_width = nbuttons * this->smallest_x;
}