I'd be the same as you Emilian, I often end up with multiple editor windows of the same diff, which is annoying. Maybe a separate dialog makes sense?
Could this be a preference thing? I.e. allow this as an editor component or as a separate dialog? or is that a lot of effort? John On 3 May 2018 at 03:14, cowwoc <cow...@bbs.darktech.org> wrote: > Multiple diffs, probably not. But I don't like IDEA-style separate dialog. > I like being able to treat the diff as just another editor tab so I can > casually move back and forth between it and the code. > > Gili > > > On 2018-05-02 9:25 PM, Emilian Bold wrote: > >> Now that you mention it, there is something odd about the diff window >> being another editor-like topcomponent. >> >> I sometimes find myself having the same diff open multiple times >> (generally after I've excluded some file manually in the Git bottom >> topcomponent). >> >> So, do people really need multiple diffs open at once? Because it's >> starting to make sense having this as a separate dialog. >> >> --emi >> >> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ >> >> On 2 May 2018 2:39 PM, Christian Lenz <christian.l...@gmx.net> wrote: >> >> As I compared it with intelliJ e.g. (only to see how intelliJ does it) >>> they open the diff window as a standalone window to remove everything which >>> is not needed. NetBeans only opens that diff for a file as a new tab. Sure >>> you can make it floatable by your own but it is not a file, so it could be >>> treated as a separate window which can be floatable via Option (not as >>> Default, because it could be disturbing some other users). So I like the >>> Approach to get more space. Maybe the drop downs can be placed close to the >>> Icons, in the same line. If this make sense. See my screenshot how WebStorm >>> handles this: https://ibb.co/jV9YW7 Only as an idea. >>> >>> It doesn’t Need the tab section and the other Icons. I added a secion >>> screenshot: https://ibb.co/bsLe4S Here you can see, what I mean. The >>> red section is not needed in my opinion. So we can remove it w/o having an >>> Option for this. And the blue section should be optional and redesigned as >>> Emilian said (textual/visual via DropDown e.g.) >>> >>> Cheers >>> >>> Chris >>> >>> Von: Emilian Bold >>> >>> Gesendet: Mittwoch, 2. Mai 2018 07:35 >>> >>> An: dev@netbeans.incubator.apache.org >>> >>> Betreff: Re: (Git) Diff Window horizontal space rescue >>> >>> I wonder if it would be a good intermediate solution to just introduce a >>>> System property that disables the enhanced flag in >>>> DefaultDiffControllerProvider. Then users can just gain some more pixels by >>>> editing the .conf file. >>>> >>> Createdhttps://github.com/apache/incubator-netbeans/pull/531 >>> >>> With both PRs I get to see 32 lines of code for the diff vs 28 lines of >>> code previously. >>> >>> This becomes even more important when I have the Output window open: I >>> get to see 18 vs 14 lines of code! >>> >>> --emi >>> >>> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ >>> >>> On 2 May 2018 7:46 AM, Emilian Bold emilian.b...@protonmail.ch wrote: >>> >>> - there is a table with all the files being diff-ed (even if it's a >>>>> single file!) and there is no way to reduce that space to zero, you always >>>>> see some part of that split pane and the split pane divider itself. I want >>>>> to add another action button in the toolbar (next to 'Display results as a >>>>> tree') that hides that whole chunk. >>>>> >>>> This seems to be rather tricky because there is a lot of state to >>>> manage in MultiDiffPanel. >>>> >>>> See the current patch https://github.com/emilianbold >>>> /incubator-netbeans/commit/7cbe909649534f136746bc960e314ff697fd4158 >>>> which does not have functioning next/prev actions when the file list is >>>> hidden. I'm also calling refreshNodes because the UI was off when re-adding >>>> the split pane (probably something with the selected node in the file list >>>> too...) >>>> >>>> - there is a tabbed pane which shows Graphical / Textual diffs and >>>>> the tab buttons take considerable space too. Generally, I just want to see >>>>> the graphical diff so I believe it would be nice to replace this with a >>>>> combobox sitting in the toolbar too. >>>>> >>>> This is caused by the EditableDiffView.enhancedView flag. >>>> >>>> I find the whole API of DiffControllerProvider.createEnhancedDiffController >>>> vs createDiffController odd. Generally we use services and location to >>>> replace a weaker service with an enhanced one. >>>> >>>> It's also unclear to me why EditableDiffView needs to be 'enhanced' and >>>> show two tabs. When we could have 2 separate providers (one for the >>>> graphical and one for the textual diff) and create the tabbed pane >>>> ourselves. Then, we could even allow the user to disable one of these >>>> services (eg, the textual one) and then show no tabbed pane if there is a >>>> single service. >>>> >>>> Also interesting that we have DiffView.getToolbar() which might be a >>>> way to provide a combobox with Graphical/Textual from EditableDiffView but >>>> this method doesn't seem to be used by the Git module. (Note how the whole >>>> idea of an enhanced view that only has a toolbar seems redundant.) >>>> >>>> I wonder if it would be a good intermediate solution to just introduce >>>> a System property that disables the enhanced flag in >>>> DefaultDiffControllerProvider. Then users can just gain some more pixels by >>>> editing the .conf file. >>>> >>>> --emi >>>> >>>> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ >>>> >>>> On 1 May 2018 10:23 AM, Emilian Bold emilian.b...@protonmail.ch wrote: >>>> >>>> Hello, >>>>> >>>>> It seems to me that a lot of horizontal space is wasted by the current >>>>> Git Diff window which means I get to see fewer and fewer line of source >>>>> code. And what I really want to see in the diff window is my source code >>>>> -- >>>>> I almost never touch any other button other than 'Commit Changes'. >>>>> >>>>> I've already made this PR https://github.com/apache/incu >>>>> bator-netbeans/pull/529 which moves the so-called 'tree selection >>>>> panel' from its own horizontal component into the toolbar. >>>>> >>>>> This saves about 70 pixels on my machine and I get to see 2 extra >>>>> lines of source code in the Diff window. >>>>> >>>>> There are two other areas wasting pixels in this window I would like >>>>> to approach: >>>>> >>>>> - there is a table with all the files being diff-ed (even if it's a >>>>> single file!) and there is no way to reduce that space to zero, you always >>>>> see some part of that split pane and the split pane divider itself. I want >>>>> to add another action button in the toolbar (next to 'Display results as a >>>>> tree') that hides that whole chunk. >>>>> - there is a tabbed pane which shows Graphical / Textual diffs >>>>> and the tab buttons take considerable space too. Generally, I just want to >>>>> see the graphical diff so I believe it would be nice to replace this with >>>>> a >>>>> combobox sitting in the toolbar too. >>>>> Of secondary concern I note that: >>>>> - at the bottom of the diff component there is a huge border of >>>>> about 20 pixels that could almost show another line. It's unclear to me >>>>> why >>>>> that is there or if it's LnF specific (I'm on macOS). >>>>> - the Graphical diff component has a header showing you what >>>>> you are comparing (HEAD / Modified in working tree). This seems almost >>>>> redundant given we have the comboboxes in the 'tree selection panel' >>>>> showing you what you are comparing (although the order is different!). It >>>>> could also be replaced by something smarter, I'm thinking of a floating, >>>>> semi-transparent label. Not sure where to put the label showing you the >>>>> current chunk number (1/10, 2/10, etc). >>>>> Let me know your thought. If anybody wants to help, join me! >>>>> --emi >>>>> >>>>> To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org >>>>> >>>>> For additional commands, e-mail: dev-h...@netbeans.incubator.ap >>>>> ache.org >>>>> >>>>> For further information about the NetBeans mailing lists, visit: >>>>> >>>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists >>>>> >>>> -- >>>> >>>> To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org >>>> >>>> For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org >>>> >>>> For further information about the NetBeans mailing lists, visit: >>>> >>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists >>>> >>> -- >>> >>> To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org >>> >>> For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org >>> >>> For further information about the NetBeans mailing lists, visit: >>> >>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists >>> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org >> For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org >> >> For further information about the NetBeans mailing lists, visit: >> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists >> >> >> >> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@netbeans.incubator.apache.org > For additional commands, e-mail: dev-h...@netbeans.incubator.apache.org > > For further information about the NetBeans mailing lists, visit: > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > > > >
