fixed remove of handle in propertyNotify
This commit is contained in:
parent
a5bf916fac
commit
0d708fa2be
1 changed files with 17 additions and 16 deletions
|
@ -22,7 +22,7 @@
|
|||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
|
||||
// $Id: Window.cc,v 1.43 2002/04/12 14:54:57 fluxgen Exp $
|
||||
// $Id: Window.cc,v 1.44 2002/04/14 11:54:59 fluxgen Exp $
|
||||
|
||||
#include "Window.hh"
|
||||
|
||||
|
@ -80,6 +80,7 @@ tab(0)
|
|||
,gnome_hints(0)
|
||||
#endif
|
||||
{
|
||||
|
||||
lastFocusTime.tv_sec = lastFocusTime.tv_usec = 0;
|
||||
|
||||
fprintf(stderr,
|
||||
|
@ -1772,7 +1773,6 @@ void FluxboxWindow::configure(int dx, int dy,
|
|||
xrect, num, ShapeUnion, Unsorted);
|
||||
}
|
||||
#endif // SHAPE
|
||||
|
||||
XMoveResizeWindow(display, frame.window, frame.x, frame.y,
|
||||
frame.width, frame.height);
|
||||
positionWindows();
|
||||
|
@ -3003,9 +3003,10 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
|
|||
client.max_height <= client.min_height)
|
||||
decorations.maximize = decorations.handle =
|
||||
functions.resize = functions.maximize = false;
|
||||
else
|
||||
decorations.maximize = decorations.handle =
|
||||
functions.resize = functions.maximize = true;
|
||||
else {
|
||||
decorations.handle = false;
|
||||
decorations.maximize = functions.resize = functions.maximize = true;
|
||||
}
|
||||
}
|
||||
|
||||
int x = frame.x, y = frame.y;
|
||||
|
@ -3083,10 +3084,11 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent *cr) {
|
|||
if (cr->value_mask & CWWidth)
|
||||
cw = cr->width + (frame.mwm_border_w * 2);
|
||||
|
||||
if (cr->value_mask & CWHeight)
|
||||
ch = cr->height + frame.y_border + (frame.mwm_border_w * 2) +
|
||||
(screen->getBorderWidth() * decorations.handle) + frame.handle_h;
|
||||
|
||||
if (cr->value_mask & CWHeight) {
|
||||
ch = cr->height + (frame.y_border + (frame.mwm_border_w * 2) +
|
||||
screen->getBorderWidth()) * decorations.border +
|
||||
frame.handle_h*decorations.handle;
|
||||
}
|
||||
if (frame.x != cx || frame.y != cy ||
|
||||
frame.width != cw || frame.height != ch) {
|
||||
configure(cx, cy, cw, ch);
|
||||
|
@ -3448,7 +3450,6 @@ void FluxboxWindow::shapeEvent(XShapeEvent *) {
|
|||
|
||||
|
||||
void FluxboxWindow::setDecoration(Decoration decoration) {
|
||||
|
||||
switch (decoration) {
|
||||
case DECOR_NONE:
|
||||
decorations.titlebar = decorations.border = decorations.handle =
|
||||
|
|
Loading…
Reference in a new issue