Geanyvc fix #300
Merged
Geanyvc fix #300
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The old way was not robust and much too complicated. navqueue_goto_line() does everything we need and we can simplify the whole thing to a single API call.
| @@ -1374,7 +1367,7 @@ create_commitDialog(void) | |||
| gtk_window_set_type_hint(GTK_WINDOW(commitDialog), GDK_WINDOW_TYPE_HINT_DIALOG); | |||
| gtk_dialog_set_has_separator(GTK_DIALOG(commitDialog), FALSE); | |||
|
|
|||
| dialog_vbox1 = GTK_DIALOG(commitDialog)->vbox; | |||
| dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG(commitDialog)); | |||
There was a problem hiding this comment.
style: no space before the opening (
|
not tested yet, but LGTM if it works |
|
Can somebody with Gtk3 please run a test? With Gtk2 it looks fine for me |
|
I found that the commit dialog hangs on GTK3. I'm checking this. However, this is not a regression so, technically it's still better as the status-quo as diff actions work. |
gtk_dialog_set_has_separator() was removed in gtk3. For some reason geanyvc successfully linked anyway, and when it was called it completely messed up GTK's internal state. The call can be removed without replacement since the separator has been off by default since a while even in GTK2.
…oth gtk 2 and 3 The useless extra paned was particularly awkward. Under gtk3 the commit dialog was hardly usable due to the tiny commit message text widget.
|
I double checked gtk3 again and fixed up the commit dialog. gtk2 build looks fine as well. One more note regarding bf20fd7: I want this in because the old code was inherently incompatible with my splitwindow2 work, and it was strange/awkward and fragile regardless. Since I would like splitwindow2 to not break any of G-P this fix must be applied. |
| @@ -392,23 +390,18 @@ show_output(const gchar * std_output, const gchar * name, | |||
| doc = document_new_file(name, ftype, std_output); | |||
| /* To due the given line is Scintilla's line number, but | |||
| * we need the view line number in this case. */ | |||
frlan
added a commit
that referenced
this pull request
Nov 10, 2015
Enable Gtk3 for GeanyVC as well as some UI fixes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
please merge the fixes for 1.26