projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c8aca2
)
make the frame iconify animation go right into the icon geometry area instead of...
author
Dana Jansens
<danakj@orodu.net>
Fri, 15 Feb 2008 06:07:15 +0000
(
01:07
-0500)
committer
Dana Jansens
<danakj@orodu.net>
Fri, 15 Feb 2008 06:07:15 +0000
(
01:07
-0500)
openbox/frame.c
patch
|
blob
|
history
diff --git
a/openbox/frame.c
b/openbox/frame.c
index
8fee3b6
..
3304f4b
100644
(file)
--- a/
openbox/frame.c
+++ b/
openbox/frame.c
@@
-1694,7
+1694,7
@@
static gboolean frame_animate_iconify(gpointer p)
g_get_current_time(&now);
time = frame_animate_iconify_time_left(self, &now);
g_get_current_time(&now);
time = frame_animate_iconify_time_left(self, &now);
- if (
time == 0 || iconifying
) {
+ if (
(time > 0 && iconifying) || (time == 0 && !iconifying)
) {
/* start where the frame is supposed to be */
x = self->area.x;
y = self->area.y;
/* start where the frame is supposed to be */
x = self->area.x;
y = self->area.y;
@@
-1725,12
+1725,11
@@
static gboolean frame_animate_iconify(gpointer p)
h = self->size.top; /* just the titlebar */
}
h = self->size.top; /* just the titlebar */
}
+ XMoveResizeWindow(ob_display, self->window, x, y, w, h);
+ XFlush(ob_display);
+
if (time == 0)
frame_end_iconify_animation(self);
if (time == 0)
frame_end_iconify_animation(self);
- else {
- XMoveResizeWindow(ob_display, self->window, x, y, w, h);
- XFlush(ob_display);
- }
return time > 0; /* repeat until we're out of time */
}
return time > 0; /* repeat until we're out of time */
}