aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-11-22 05:47:02 (GMT)
committermarkt <markt>2007-11-22 05:47:02 (GMT)
commitcdfafcaa4eb16dc78919fd1dac13fe103becc9f0 (patch)
treeefa22e7e3a05938ac3ee138c1694eab5c8fe5acf
parent0a7cb3db1f1eaf18eeed8695a7434027bfc7ce6c (diff)
downloadfluxbox-cdfafcaa4eb16dc78919fd1dac13fe103becc9f0.zip
fluxbox-cdfafcaa4eb16dc78919fd1dac13fe103becc9f0.tar.bz2
set resize increments to 1 when set to 0 by the application
-rw-r--r--ChangeLog3
-rw-r--r--src/WinClient.cc5
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 18c51ed..a0e0446 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/11/22: 3*07/11/22:
4 * Fix division by 0 error when resize increments are set to 0 by an
5 application, bug #1836182
6 WinClient.cc
4 * Added conditional statements to key commands (Mark) 7 * Added conditional statements to key commands (Mark)
5 - for example, this will search for an open xterm window, cycle through 8 - for example, this will search for an open xterm window, cycle through
6 them if there are any, or else open one: 9 them if there are any, or else open one:
diff --git a/src/WinClient.cc b/src/WinClient.cc
index 83637e2..fb9fec6 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -508,6 +508,11 @@ void WinClient::updateWMNormalHints() {
508 } else 508 } else
509 width_inc = height_inc = 1; 509 width_inc = height_inc = 1;
510 510
511 if (width_inc == 0)
512 width_inc = 1;
513 if (height_inc == 0)
514 height_inc = 1;
515
511 if (sizehint.flags & PAspect) { 516 if (sizehint.flags & PAspect) {
512 min_aspect_x = sizehint.min_aspect.x; 517 min_aspect_x = sizehint.min_aspect.x;
513 min_aspect_y = sizehint.min_aspect.y; 518 min_aspect_y = sizehint.min_aspect.y;