summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-11-17 12:50:20 (GMT)
committerfluxgen <fluxgen>2002-11-17 12:50:20 (GMT)
commit1193d5b6e2293ce64bbeb594b135de9a76657d8b (patch)
tree656c842695d6c18f1d7fc99c9037600c1538f58e
parent08f299afc00a0072775a2d7db755cd62a53a49bf (diff)
downloadfluxbox_lack-1193d5b6e2293ce64bbeb594b135de9a76657d8b.zip
fluxbox_lack-1193d5b6e2293ce64bbeb594b135de9a76657d8b.tar.bz2
functions in toggleDecor and extra tab creation checking in toggleTab
-rw-r--r--src/Window.cc17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc
index c17b40b..1a8106a 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.99 2002/11/17 11:29:06 fluxgen Exp $ 25// $Id: Window.cc,v 1.100 2002/11/17 12:50:20 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -1541,8 +1541,11 @@ void FluxboxWindow::setTab(bool flag) {
1541 if (flag) { 1541 if (flag) {
1542 if (!tab && isGroupable()) 1542 if (!tab && isGroupable())
1543 tab = new Tab(this, 0, 0); 1543 tab = new Tab(this, 0, 0);
1544 tab->focus(); // draws the tab with correct texture 1544
1545 tab->setPosition(); // set tab windows position 1545 if (tab) {
1546 tab->focus(); // draws the tab with correct texture
1547 tab->setPosition(); // set tab windows position
1548 }
1546 1549
1547 } else if (tab) { 1550 } else if (tab) {
1548 delete tab; 1551 delete tab;
@@ -3123,7 +3126,7 @@ void FluxboxWindow::shapeEvent(XShapeEvent *) {
3123} 3126}
3124#endif // SHAPE 3127#endif // SHAPE
3125 3128
3126 3129// TODO: functions should not be affected by decoration
3127void FluxboxWindow::setDecoration(Decoration decoration) { 3130void FluxboxWindow::setDecoration(Decoration decoration) {
3128 switch (decoration) { 3131 switch (decoration) {
3129 case DECOR_NONE: 3132 case DECOR_NONE:
@@ -3131,9 +3134,9 @@ void FluxboxWindow::setDecoration(Decoration decoration) {
3131 decorations.iconify = decorations.maximize = 3134 decorations.iconify = decorations.maximize =
3132 decorations.tab = false; //tab is also a decor 3135 decorations.tab = false; //tab is also a decor
3133 decorations.menu = true; // menu is present 3136 decorations.menu = true; // menu is present
3134 functions.iconify = functions.maximize = false; 3137 // functions.iconify = functions.maximize = true;
3135 functions.move = true; // We need to move even without decor 3138 // functions.move = true; // We need to move even without decor
3136 functions.resize = true; // We need to resize even without decor 3139 // functions.resize = true; // We need to resize even without decor
3137 3140
3138 break; 3141 break;
3139 3142