Before starting... thanks Johann!
On Fri 28.Aug'09 at 23:20:30 +0200, Johann Haarhoff wrote:
>
> I will try to code up something maximus-like sometime this weekend,
Cool.
>>> - changed_h = ((wwin->flags.maximized ^ directions) & MAX_HORIZONTAL);
>>> - changed_v = ((wwin->flags.maximized ^ directions) & MAX_VERTICAL);
>>> - shrink_h = (changed_h && (directions & MAX_HORIZONTAL) == 0);
>>> - shrink_v = (changed_v && (directions & MAX_VERTICAL) == 0);
>>> + directions &= (MAX_HORIZONTAL|MAX_VERTICAL|MAX_LEFTHALF|MAX_RIGHTHALF);
>>
>> Why can you get rid of those lines,
>
> It turns out you can't. I initially thought you could and removed them, but I
> put them back in the next patch (Fixed-Windows-Losing-Size-After-Maximize).
Ok. In fact this is why I thought I had mis-merged your patch some time ago
and asked you to resend it against the git tree (thanks btw!).
Because when I looked at it again during this 'next' versus 'master' stuff
I had my doubts.
[ As your previous patch was based on the mercurial tree with the "old"
coding style I made an experiment with git, and checkout out a commit
previous to the one where used 'indent' into a new branch, applied your
patch there and then used the same 'indent' command on it, commited
the result and compared against another branch right after the code
style change and merged the result back into the original branch. That is
why I had my doubts about the merging when I saw those "unrelated" changes
and that is why I asked about them when I saw your resent patch. It turned
out that git did the right thing originally :-) ]
> The "Fixed-Windows-Losing-Size-After-Maximize" and "Left Half / Right Half
> Maximize"
> patches should be merged into one patch, but my git-fu is a bit lacking.
Ok, I merged them (see below) and pushed it to 'next'.
In case you need to merge more patches into one in the future, say the
last two, you can do
git rebase -i HEAD~2
and you will be prompted about what to do. Change 'pick' to 'squash'
in the line showing the patch you want to merge back and there you
go (you will also have the opportunity to change the commit message).
On Fri 28.Aug'09 at 23:07:48 +0200, Johann Haarhoff wrote:
> This fixes the known bug in the previous patch (Left Half / Right Half
> Maximize).
> [...]
>
> Also, added "tags" to .gitignore
> ---
> .gitignore | 1 +
Why do you need that? I removed this change from you patch before pushing
to 'next' until I understand why. In any case, that is unrelated to
your patch to I can do it later if needed (but I don't see any file
named tag here)
--
To unsubscribe, send mail to [email protected].
