Community
Participate
Working Groups
Created attachment 197784 [details] screenshot of git compare in new layout Compare page is one of the few (only) that is using icons in the toolbar. The placement of commands is also not ideal. Now that layout is changing in bug 347181, we can probably go back to pinning some commands on the right, because the progress notification is moving in the new layout. I'll look at this since I'm the one who has been causing Libing trouble in this area.
I would also like to look at those pane titles. They don't wrap so often they are truncated. Also, the dark gray could be tweaked now that we aren't using it in the main layout. Libing, I'll ping you when I'm looking at it to make sure I understand all the constraints/issues.
(In reply to comment #1) > I would also like to look at those pane titles. They don't wrap so often they > are truncated. Also, the dark gray could be tweaked now that we aren't using > it in the main layout. > > Libing, I'll ping you when I'm looking at it to make sure I understand all the > constraints/issues. Yes , Susan , the pane titles were set to no-wrap in purpose. e.g. if the left side is wrapped and right is not , then the two panes are not at same height. Lets talk about all things together . Please ping me when you touch it.
Unfortunately I did not get to this fix until Libing was gone. I've fixed this bug in the branch. However I'm not sure if he'll see this Thursday and I'll be gone most of Friday (until the fall). cc'ing Mark and Boris in case Libing needs to change anything and needs another review. Can you guys make sure something like this gets in? I think this is important because it greatly improves the usability of two-way compare. I'm not too familiar with Libing's code so this needs review. The code is in the branch: remotes/origin/bug349036 You can view the diffs here: http://git.eclipse.org/c/e4/org.eclipse.orion.client.git/commit/?h=bug349036 The idea is to create an extra column in the right side compare container to hold the commands. I had to right justify both the table row and the table itself for the right side container so that when the window shrinks, the commands will not disappear. Currently the dom id of this command area is known by two files. This is not ideal and I've commented it as such. The downside to this fix is that you now could lose the leading path title information on the right hand compare editor if you shrink the page down, and the leading path info is the distinguishing part. However this was the only way I could get the commands to always show, and showing them is more important. I think the usability tradeoff is well worth it. I also switched to the new icons and removed the unused icons. (Libing, please double check that none of the icons previously in the images/compare folder are needed anymore.) The change to the command framework was added so that we could render commands into a dom node specified by id rather than having the node in hand.
Libing made a 1-line change to Susan's patch which fixes an issue with readonly compare editors. I reviewed it. +1
As Mark mentioned , I made one line change in the compare-container.js.(Susan's patch did not render "next diff" and "previous diff" commands in read only mode) So my change was to keep these 2 commands in read only mode while writable mode has "copy to left from right" additionally.
I've pushed my change to branch remotes/origin/bug349036.
pushed to master with 7ec45654fc55380973720c8b66fdf61c5a0abbc6
Found another issue: the .png files representing a deletion in compare editor(border-like thin line) were accidentally removed. Reviewed with Mark and push change with 00219771d0fdc84913e06442c29b9acaa7a610b6
