← Back to branch summary

~ubuntu-branches/ubuntu/precise/xfwm4/precise-updates

« back to all changes in this revision

Viewing changes to src/placement.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Casadevall
  • Date: 2008-11-10 07:40:26 UTC
  • mfrom: (1.1.20 upstream)
  • Revision ID: james.westby@ubuntu.com-20081110074026-xo3f144nja3wl7kz
Tags: 4.4.3-0ubuntu1
* Merge with Debian Xfce UNRELEASED, remaining Ubuntu changes
  - debian/xfwm4.1: update bug reporting address (LP instead of Debian BTS).
  - debian/rules: keep the .desktop installed, but add "NoDisplay=true" to hide
    them by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/placement.c
1
 
/*      $Id: placement.c 25779 2007-06-03 15:33:52Z olivier $
 
1
/*      $Id: placement.c 26966 2008-05-17 08:22:17Z olivier $
2
2
 
3
3
        This program is free software; you can redistribute it and/or modify
4
4
        it under the terms of the GNU General Public License as published by
390
390
            frame_y = frameY (c);
391
391
            ret |= CLIENT_CONSTRAINED_BOTTOM;
392
392
        }
393
 
        if ((frame_y < disp_y) && (frame_y >= disp_y - frame_top))
 
393
        if ((frame_y <= disp_y) && (frame_y >= disp_y - frame_top))
394
394
        {
395
395
            c->y = disp_y + frame_top;
396
396
            frame_y = frameY (c);