Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 343579 - Merge dialog should have margins
Summary: Merge dialog should have margins
Status: CLOSED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-21 12:17 EDT by Benjamin Muskalla CLA
Modified: 2011-07-17 09:27 EDT (History)
1 user (show)

See Also:


Attachments
branch and rebase dialogs with "default" borders on linux (50.62 KB, image/png)
2011-04-21 14:19 EDT, Dariusz Luksza CLA
no flags Details
merge dialog linux (28.41 KB, image/png)
2011-04-28 06:19 EDT, Benjamin Muskalla CLA
no flags Details
screenshot (75.89 KB, image/png)
2011-07-15 11:37 EDT, Benjamin Muskalla CLA
no flags Details
Rebase dialog after second changeset (16.75 KB, image/png)
2011-07-15 12:15 EDT, Dariusz Luksza CLA
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Benjamin Muskalla CLA 2011-04-21 12:17:38 EDT
The merge dialog has no margins around it children (filtered tree). There should be a margin like in every other wizard.
Comment 1 Dariusz Luksza CLA 2011-04-21 14:18:52 EDT
After yours change http://egit.eclipse.org/r/#change,3201 the branch dialog looks really ugly on my linux. To be hones I really like actual branch dialog (that one without borders)

Please see attached screenshots.
Comment 2 Dariusz Luksza CLA 2011-04-21 14:19:27 EDT
Created attachment 193871 [details]
branch and rebase dialogs with "default" borders on linux
Comment 3 Benjamin Muskalla CLA 2011-04-28 06:19:54 EDT
Created attachment 194249 [details]
merge dialog linux

This is how the merge dialog currenlty looks like for me on Linux. Without the borders, it looks pretty broken for me compared to all other dialog which have borders.
Comment 4 Dariusz Luksza CLA 2011-05-05 17:22:24 EDT
OK, I can agree that this dialog need some borders. But I don't think that it need to have such "large" borders, especially right border should be thinner (it shouldn't have same width .like 'checkout' button).
Comment 5 Thomas Ehrnhoefer CLA 2011-05-05 17:55:34 EDT
Shouldn't it just use swtdefaults? On windows, that adds 5px margins, not sure what it does for linux (or if that's even OS specific)
Comment 6 Dariusz Luksza CLA 2011-05-05 18:02:32 EDT
I don't think that for Linux the swtdefault margin defines 20px right margin and 5px for top and left margin. Maybe the root cause of this issue is somewhere else and adding margins only expose issue that was there for some time.
Comment 7 Thomas Ehrnhoefer CLA 2011-05-05 18:24:00 EDT
agreed :) 20px sounds like a lot. Picasso should show what's wrong, maybe nested containers each add the swtdefault margin
Comment 8 Benjamin Muskalla CLA 2011-07-15 11:37:33 EDT
Created attachment 199754 [details]
screenshot

screenshot for the new change
Comment 9 Dariusz Luksza CLA 2011-07-15 12:15:17 EDT
Created attachment 199757 [details]
Rebase dialog after second changeset

Reset and branch dialogs looks good, only rebase dialog is broken.
Comment 10 Dariusz Luksza CLA 2011-07-17 09:27:34 EDT
merged as 773a08ef0529e24d594c1269482ee3e615e891bb