Commits May 2016

commits@lists.geany.org

1 participants
37 discussions

[geany/geany] ead0e9: GTK: Fix fetching the frame border width on GTK 3.20
by Colomban Wendling 02 May '16

02 May '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 02 May 2016 13:19:26 UTC Commit: ead0e9ee5fb6d0242a729f86991c16979ff90fae https://github.com/geany/geany/commit/ead0e9ee5fb6d0242a729f86991c16979ff90… Log Message: ----------- GTK: Fix fetching the frame border width on GTK 3.20 GTK 3.20 introduced a sub-node named "border" to the frame, requiring to lookup the border on that sub-node rather than on the frame itself. Unfortunately supporting this requires to be built against GTK 3.20, as it requires API this version introduced. This means that a build against an older version won't be able to get the popup sizing right if running on 3.20. To mitigate this, add reasonable fallback defaults when running 3.20 but built on an earlier version, to try and avoid X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/ X-Scintilla-Commit-ID: 83d56b1fc63a206e4c1b776f5991b3b17ccb3473 2px-scrolling on GTK 3.20's default theme. Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 25 lines changed, 24 insertions(+), 1 deletions(-) =================================================================== @@ -1534,12 +1534,34 @@ PRectangle ListBoxX::GetDesiredRect() { int row_height = GetRowHeight(); #if GTK_CHECK_VERSION(3,0,0) GtkStyleContext *styleContextFrame = gtk_widget_get_style_context(PWidget(frame)); - GtkBorder padding, border; + GtkBorder padding, border, border_border = { 0, 0, 0, 0 }; gtk_style_context_get_padding(styleContextFrame, GTK_STATE_FLAG_NORMAL, &padding); gtk_style_context_get_border(styleContextFrame, GTK_STATE_FLAG_NORMAL, &border); + +# if GTK_CHECK_VERSION(3,20,0) + // on GTK 3.20 the frame border is in a sub-node "border". + // Unfortunately we need to be built against 3.20 to be able to support this, as it requires + // new API. + GtkStyleContext *styleContextFrameBorder = gtk_style_context_new(); + GtkWidgetPath *widget_path = gtk_widget_path_copy(gtk_style_context_get_path(styleContextFrame)); + gtk_widget_path_append_type(widget_path, GTK_TYPE_BORDER); // dummy type + gtk_widget_path_iter_set_object_name(widget_path, -1, "border"); + gtk_style_context_set_path(styleContextFrameBorder, widget_path); + gtk_widget_path_free(widget_path); + gtk_style_context_get_border(styleContextFrameBorder, GTK_STATE_FLAG_NORMAL, &border_border); + g_object_unref(styleContextFrameBorder); +# else // < 3.20 + if (gtk_check_version(3, 20, 0) == NULL) { + // default to 1px all around as it's likely what it is, and so we don't miss 2px height + // on GTK 3.20 when built against an earlier version. + border_border.top = border_border.bottom = border_border.left = border_border.right = 1; + } +# endif + height = (rows * row_height + padding.top + padding.bottom + border.top + border.bottom + + border_border.top + border_border.bottom + 2 * gtk_container_get_border_width(GTK_CONTAINER(PWidget(list)))); #else height = (rows * row_height @@ -1560,6 +1582,7 @@ PRectangle ListBoxX::GetDesiredRect() { #if GTK_CHECK_VERSION(3,0,0) rc.right += (padding.left + padding.right + border.left + border.right + + border_border.left + border_border.right + 2 * gtk_container_get_border_width(GTK_CONTAINER(PWidget(list)))); #else rc.right += 2 * (PWidget(frame)->style->xthickness -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 272372: GTK: Plug a memory leak
by Colomban Wendling 02 May '16

02 May '16

1 0

[geany/geany] abf036: GTK: Fix auto-completion popup sizing code for GTK 3.20
by Colomban Wendling 02 May '16

02 May '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 02 May 2016 13:19:26 UTC Commit: abf0365e43156be12cc0a03b0a5fb6325039b6f0 https://github.com/geany/geany/commit/abf0365e43156be12cc0a03b0a5fb6325039b… Log Message: ----------- GTK: Fix auto-completion popup sizing code for GTK 3.20 GTK 3.20's GtkScrolledWinodw doesn't like having a too small allocation and spews scary assertion failures. Fix that by requesting the real size we'd like instead of hard-coding 1 as small-enough value in our overriding height requisition method. The actual value doesn't really matter so long as it's small enough anyway, as we resize the popup to fit later on. Note: this moves the actual implementation of ListBoxX::GetRowHeight() to the new convenience function treeViewGetRowHeight(), with no changes in implementation. X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/ X-Scintilla-Commit-ID: 5a0afdd87d56d837dd8068e234aed8e2b6bdbe93 Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 63 lines changed, 39 insertions(+), 24 deletions(-) =================================================================== @@ -1263,6 +1263,31 @@ ListBox *ListBox::Allocate() { return lb; } +static int treeViewGetRowHeight(GtkTreeView *view) +{ +#if GTK_CHECK_VERSION(3,0,0) + // This version sometimes reports erroneous results on GTK2, but the GTK2 + // version is inaccurate for GTK 3.14. + GdkRectangle rect; + GtkTreePath *path = gtk_tree_path_new_first(); + gtk_tree_view_get_background_area(view, path, NULL, &rect); + gtk_tree_path_free(path); + return rect.height; +#else + int row_height=0; + int vertical_separator=0; + int expander_size=0; + GtkTreeViewColumn *column = gtk_tree_view_get_column(view, 0); + gtk_tree_view_column_cell_get_size(column, NULL, NULL, NULL, NULL, &row_height); + gtk_widget_style_get(GTK_WIDGET(view), + "vertical-separator", &vertical_separator, + "expander-size", &expander_size, NULL); + row_height += vertical_separator; + row_height = Platform::Maximum(row_height, expander_size); + return row_height; +#endif +} + // SmallScroller, a GtkScrolledWindow that can shrink very small, as // gtk_widget_set_size_request() cannot shrink widgets on GTK3 typedef struct { @@ -1287,9 +1312,19 @@ G_DEFINE_TYPE(SmallScroller, small_scroller, GTK_TYPE_SCROLLED_WINDOW) #if GTK_CHECK_VERSION(3,0,0) static void small_scroller_get_preferred_height(GtkWidget *widget, gint *min, gint *nat) { - GTK_WIDGET_CLASS(small_scroller_parent_class)->get_preferred_height(widget, min, nat); - if (*min > 1) - *min = 1; + GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget)); + if (GTK_IS_TREE_VIEW(child)) { + GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(child)); + int n_rows = gtk_tree_model_iter_n_children(model, NULL); + int row_height = treeViewGetRowHeight(GTK_TREE_VIEW(child)); + + *min = MAX(1, row_height); + *nat = MAX(*min, n_rows * row_height); + } else { + GTK_WIDGET_CLASS(small_scroller_parent_class)->get_preferred_height(widget, min, nat); + if (*min > 1) + *min = 1; + } } #else static void small_scroller_size_request(GtkWidget *widget, GtkRequisition *req) { @@ -1488,27 +1523,7 @@ int ListBoxX::GetVisibleRows() const { int ListBoxX::GetRowHeight() { -#if GTK_CHECK_VERSION(3,0,0) - // This version sometimes reports erroneous results on GTK2, but the GTK2 - // version is inaccurate for GTK 3.14. - GdkRectangle rect; - GtkTreePath *path = gtk_tree_path_new_first(); - gtk_tree_view_get_background_area(GTK_TREE_VIEW(list), path, NULL, &rect); - gtk_tree_path_free(path); - return rect.height; -#else - int row_height=0; - int vertical_separator=0; - int expander_size=0; - GtkTreeViewColumn *column = gtk_tree_view_get_column(GTK_TREE_VIEW(list), 0); - gtk_tree_view_column_cell_get_size(column, NULL, NULL, NULL, NULL, &row_height); - gtk_widget_style_get(PWidget(list), - "vertical-separator", &vertical_separator, - "expander-size", &expander_size, NULL); - row_height += vertical_separator; - row_height = Platform::Maximum(row_height, expander_size); - return row_height; -#endif + return treeViewGetRowHeight(GTK_TREE_VIEW(list)); } PRectangle ListBoxX::GetDesiredRect() { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ba58a3: GTK: Get border for the exact current style's state on GTK 3
by Colomban Wendling 02 May '16

02 May '16

1 0

[geany/geany] 0a0c9b: Move function braces for consistency.
by Neil Hodgson 02 May '16

02 May '16

Branch: refs/heads/master Author: Neil Hodgson <nyamatongwe(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 02 May 2016 13:19:26 UTC Commit: 0a0c9bb7ce3d58939e32a8f47e46a3624c02e22d https://github.com/geany/geany/commit/0a0c9bb7ce3d58939e32a8f47e46a3624c02e… Log Message: ----------- Move function braces for consistency. X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/ X-Scintilla-Commit-ID: cdded8beb41e4a494e68b76a6bafeeae14b0d103 Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -1263,8 +1263,7 @@ ListBox *ListBox::Allocate() { return lb; } -static int treeViewGetRowHeight(GtkTreeView *view) -{ +static int treeViewGetRowHeight(GtkTreeView *view) { #if GTK_CHECK_VERSION(3,0,0) // This version sometimes reports erroneous results on GTK2, but the GTK2 // version is inaccurate for GTK 3.14. @@ -1521,8 +1520,7 @@ int ListBoxX::GetVisibleRows() const { return desiredVisibleRows; } -int ListBoxX::GetRowHeight() -{ +int ListBoxX::GetRowHeight() { return treeViewGetRowHeight(GTK_TREE_VIEW(list)); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bf3140: Do not call deprecated functions on newer GTK+.
by Neil Hodgson 02 May '16

02 May '16

Branch: refs/heads/master Author: Neil Hodgson <nyamatongwe(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 02 May 2016 13:19:26 UTC Commit: bf3140004d1618e0ae5fad1595aadf6835a97551 https://github.com/geany/geany/commit/bf3140004d1618e0ae5fad1595aadf6835a97… Log Message: ----------- Do not call deprecated functions on newer GTK+. X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/ X-Scintilla-Commit-ID: 5e4f2e6c167ee30e2c2bfadd1b1579c3d8716c60 Modified Paths: -------------- scintilla/gtk/ScintillaGTK.cxx Modified: scintilla/gtk/ScintillaGTK.cxx 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -472,8 +472,10 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) { #else gdk_window_set_user_data(gtk_widget_get_window(widget), widget); #endif +#if !GTK_CHECK_VERSION(3,18,0) gtk_style_context_set_background(gtk_widget_get_style_context(widget), gtk_widget_get_window(widget)); +#endif gdk_window_show(gtk_widget_get_window(widget)); UnRefCursor(cursor); #else @@ -1223,7 +1225,9 @@ bool ScintillaGTK::ModifyScrollBars(int nMax, int nPage) { gtk_adjustment_set_upper(adjustmentv, nMax + 1); gtk_adjustment_set_page_size(adjustmentv, nPage); gtk_adjustment_set_page_increment(adjustmentv, pageScroll); +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmentv)); +#endif modified = true; } @@ -1242,7 +1246,9 @@ bool ScintillaGTK::ModifyScrollBars(int nMax, int nPage) { gtk_adjustment_set_page_size(adjustmenth, pageWidth); gtk_adjustment_set_page_increment(adjustmenth, pageIncrement); gtk_adjustment_set_step_increment(adjustmenth, charWidth); +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmenth)); +#endif modified = true; } if (modified && (paintState == painting)) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 62be0b: Fix our tab close buttons appearance on GTK 3.20
by Colomban Wendling 02 May '16

02 May '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 02 May 2016 13:07:50 UTC Commit: 62be0b9b9669483fa9f84aa6473b0b6e48f990a2 https://github.com/geany/geany/commit/62be0b9b9669483fa9f84aa6473b0b6e48f99… Log Message: ----------- Fix our tab close buttons appearance on GTK 3.20 Modified Paths: -------------- data/geany-3.20.css Modified: data/geany-3.20.css 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -4,5 +4,8 @@ #geany-close-tab-button { outline-offset: 0; outline-width: 0; - border: 0; + margin: 0; + margin-left: 0.5em; + min-width: 0; + min-height: 0; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2016