This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
discards 26581ffb5881bf7ab9caaa791f141631e975ac7e (commit)
via e0b2196f7d2cefee2b835ba788a9fb225e56911e (commit)
via a9259582198b471216489008b8e301bd08c62e05 (commit)
via e38181da6f08f426ed693f9517aa3935a92ab92d (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (26581ffb5881bf7ab9caaa791f141631e975ac7e)
N -- N -- N (e0b2196f7d2cefee2b835ba788a9fb225e56911e)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/e0b2196f7d2cefee2b835ba788a9fb225e56911e
commit e0b2196f7d2cefee2b835ba788a9fb225e56911e
Author: Amadeusz SÅawiÅski <[email protected]>
Date: Mon Nov 11 15:59:47 2013 +0100
take dock into account when not covering icons next to it
diff --git a/src/actions.c b/src/actions.c
index e7d1c33..644412c 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -398,6 +398,21 @@ void wMaximizeWindow(WWindow *wwin, int directions)
}
}
+ /* check if icons are on the same side as dock, and adjust if not done
already */
+ if (scr->dock && wPreferences.no_window_over_icons &&
!wPreferences.no_window_over_dock) {
+ int offset = wPreferences.icon_size + DOCK_EXTRA_SPACE;
+
+ if (wPreferences.icon_yard & IY_VERT) {
+ if (scr->dock->on_right_side && (wPreferences.icon_yard
& IY_RIGHT)) {
+ usableArea.x2 -= offset;
+ }
+ /* can't use IY_LEFT in if, it's 0 ... */
+ if (!scr->dock->on_right_side &&
!(wPreferences.icon_yard & IY_RIGHT)) {
+ usableArea.x1 += offset;
+ }
+ }
+ }
+
/* Only save directions, not kbd or xinerama hints */
directions &= (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF |
MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
http://repo.or.cz/w/wmaker-crm.git/commit/a9259582198b471216489008b8e301bd08c62e05
commit a9259582198b471216489008b8e301bd08c62e05
Author: Amadeusz SÅawiÅski <[email protected]>
Date: Mon Nov 11 15:59:46 2013 +0100
make adjustments for dock when calculating area for miniwindows
diff --git a/src/actions.c b/src/actions.c
index b1dca26..e7d1c33 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1741,7 +1741,20 @@ void wArrangeIcons(WScreen *scr, Bool arrangeAll)
for (head = 0; head < heads; ++head) {
WArea area = wGetUsableAreaForHead(scr, head, NULL, False);
- WMRect rect = wmkrect(area.x1, area.y1, area.x2 - area.x1,
area.y2 - area.y1);
+ WMRect rect;
+
+ if (scr->dock) {
+ int offset = wPreferences.icon_size + DOCK_EXTRA_SPACE;
+
+ if (scr->dock->on_right_side) {
+ area.x2 -= offset;
+ } else {
+ area.x1 += offset;
+ }
+ }
+
+ rect = wmkrect(area.x1, area.y1, area.x2 - area.x1, area.y2 -
area.y1);
+
vars[head].pi = vars[head].si = 0;
vars[head].sx1 = rect.pos.x;
vars[head].sy1 = rect.pos.y;
http://repo.or.cz/w/wmaker-crm.git/commit/e38181da6f08f426ed693f9517aa3935a92ab92d
commit e38181da6f08f426ed693f9517aa3935a92ab92d
Author: Amadeusz SÅawiÅski <[email protected]>
Date: Mon Nov 11 15:59:45 2013 +0100
move maximization size adjustments to maximization function
now wGetUsableAreaForHead returns better result
diff --git a/src/actions.c b/src/actions.c
index 1087117..b1dca26 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -354,6 +354,7 @@ void wMaximizeWindow(WWindow *wwin, int directions)
WArea usableArea, totalArea;
Bool has_border = 1;
int adj_size;
+ WScreen *scr = wwin->screen_ptr;
if (!IS_RESIZABLE(wwin))
return;
@@ -362,14 +363,14 @@ void wMaximizeWindow(WWindow *wwin, int directions)
has_border = 0;
/* the size to adjust the geometry */
- adj_size = wwin->screen_ptr->frame_border_width * 2 * has_border;
+ adj_size = scr->frame_border_width * 2 * has_border;
/* save old coordinates before we change the current values */
if (!wwin->flags.maximized)
save_old_geometry(wwin, SAVE_GEOMETRY_ALL);
- totalArea.x2 = wwin->screen_ptr->scr_width;
- totalArea.y2 = wwin->screen_ptr->scr_height;
+ totalArea.x2 = scr->scr_width;
+ totalArea.y2 = scr->scr_height;
totalArea.x1 = 0;
totalArea.y1 = 0;
usableArea = totalArea;
@@ -386,6 +387,17 @@ void wMaximizeWindow(WWindow *wwin, int directions)
usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True);
}
+ /* check if user wants dock covered */
+ if (scr->dock && (!scr->dock->lowered ||
wPreferences.no_window_over_dock)) {
+ int offset = wPreferences.icon_size + DOCK_EXTRA_SPACE;
+
+ if (scr->dock->on_right_side) {
+ usableArea.x2 -= offset;
+ } else {
+ usableArea.x1 += offset;
+ }
+ }
+
/* Only save directions, not kbd or xinerama hints */
directions &= (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF |
MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
diff --git a/src/screen.c b/src/screen.c
index c7295f3..d40d333 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -710,16 +710,6 @@ void wScreenUpdateUsableArea(WScreen * scr)
scr->totalUsableArea[i].x2 = rect.pos.x + rect.size.width;
scr->totalUsableArea[i].y2 = rect.pos.y + rect.size.height;
- if (scr->dock && dock_head == i && (!scr->dock->lowered ||
wPreferences.no_window_over_dock)) {
- int offset = wPreferences.icon_size + DOCK_EXTRA_SPACE;
-
- if (scr->dock->on_right_side) {
- scr->totalUsableArea[i].x2 -= offset;
- } else {
- scr->totalUsableArea[i].x1 += offset;
- }
- }
-
if (wNETWMGetUsableArea(scr, i, &area)) {
scr->totalUsableArea[i].x1 =
WMAX(scr->totalUsableArea[i].x1, area.x1);
scr->totalUsableArea[i].y1 =
WMAX(scr->totalUsableArea[i].y1, area.y1);
-----------------------------------------------------------------------
Summary of changes:
src/actions.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
src/screen.c | 10 ----------
2 files changed, 44 insertions(+), 21 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
