aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-04-23 16:09:00 (GMT)
committermarkt <markt>2007-04-23 16:09:00 (GMT)
commitcd238a475b96806752a0d232c6b09d1627de58c1 (patch)
tree1bc7e5e1123379f7460b78356641c94df28a6a83 /src/Window.cc
parentd267acc8e0a87d16700cc8e5ee4c149b85bb4fc7 (diff)
downloadfluxbox_pavel-cd238a475b96806752a0d232c6b09d1627de58c1.zip
fluxbox_pavel-cd238a475b96806752a0d232c6b09d1627de58c1.tar.bz2
disabled resizing shaded windows
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/Window.cc b/src/Window.cc
index a6fff7c..066d962 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1252,29 +1252,26 @@ void FluxboxWindow::resize(unsigned int width, unsigned int height) {
1252 1252
1253// send_event is just an override 1253// send_event is just an override
1254void FluxboxWindow::moveResize(int new_x, int new_y, 1254void FluxboxWindow::moveResize(int new_x, int new_y,
1255 unsigned int new_width, unsigned int new_height, bool send_event) { 1255 unsigned int new_width, unsigned int new_height,
1256 bool send_event) {
1256 1257
1257 // magic to detect if moved during initialisation 1258 // magic to detect if moved during initialisation
1258 if (!m_initialized) 1259 if (!m_initialized)
1259 m_old_pos_x = 1; 1260 m_old_pos_x = 1;
1260 1261
1261 send_event = send_event || (frame().x() != new_x || frame().y() != new_y); 1262 send_event = send_event || frame().x() != new_x || frame().y() != new_y;
1263
1264 if ((new_width != frame().width() || new_height != frame().height()) &&
1265 isResizable() && !isShaded()) {
1262 1266
1263 if (new_width != frame().width() || new_height != frame().height()) {
1264 if ((((signed) frame().width()) + new_x) < 0) 1267 if ((((signed) frame().width()) + new_x) < 0)
1265 new_x = 0; 1268 new_x = 0;
1266 if ((((signed) frame().height()) + new_y) < 0) 1269 if ((((signed) frame().height()) + new_y) < 0)
1267 new_y = 0; 1270 new_y = 0;
1268 1271
1269 if (!isResizable()) {
1270 new_width = width();
1271 new_height = height();
1272 }
1273
1274 frame().moveResize(new_x, new_y, new_width, new_height); 1272 frame().moveResize(new_x, new_y, new_width, new_height);
1275 setFocusFlag(focused); 1273 setFocusFlag(focused);
1276 1274
1277 shaded = false;
1278 send_event = true; 1275 send_event = true;
1279 } else if (send_event) 1276 } else if (send_event)
1280 frame().move(new_x, new_y); 1277 frame().move(new_x, new_y);