Review Request 125522: Use NETRootInfo to initiate wm move operation

[Harald Sitter]

> On Nov. 5, 2015, 8:42 a.m., Harald Sitter wrote:
> > This was commited as 454483b51f86f0b15403ffdf6643735100080565 (in Plasma/5.4)
> > Chronological later commit b2c06365a27fb89e61ce00831fdfa949627c1e24 (in master)
> > then restored the mouse override with an ifdef.
> > No clue which of the two should win in a merge. Therefore I can't merge 5.4->master. Maybe someone could fix that please.
> 
> Hugo Pereira Da Costa wrote:
>     Second commit wins. What do I need to do to fix ? Cherry-pick it in 5.4 ? I'm no expert on merging branches. Instructions welcome. 
>     
>     Hugo

git checkout master
git pull
git merge origin/Plasma/5.4

then you can resolve the confict. git mergetool would give you some kind of UI to help with that (I recommend using kdiff3 as mergetool)


- Harald


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125522/#review88037
-----------------------------------------------------------


On Oct. 8, 2015, 6:52 p.m., David Rosca wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/125522/
> -----------------------------------------------------------
> 
> (Updated Oct. 8, 2015, 6:52 p.m.)
> 
> 
> Review request for Plasma and Hugo Pereira Da Costa.
> 
> 
> Repository: breeze
> 
> 
> Description
> -------
> 
> Also remove hack that messes with cursor position, which results in window sometimes rendered in wrong position for a moment after starting window move.
> 
> I'm not sure why there was added a button release before ungrabbing pointer in startDrag(), but it works fine without it.
> 
> 
> Diffs
> -----
> 
>   kstyle/breezewindowmanager.h 7989052 
>   kstyle/breezewindowmanager.cpp a9ad7ee 
> 
> Diff: https://git.reviewboard.kde.org/r/125522/diff/
> 
> 
> Testing
> -------
> 
> Moving windows still works.
> I cannot reproduce the issue described in comment of the mentioned hack.
> 
> 
> Thanks,
> 
> David Rosca
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20151105/f1089c10/attachment.html>