Commits September 2014

commits@lists.geany.org

1 participants
47 discussions

[geany/geany] 634a4b: Highlight C types from tags in C++ code
by Matthew Brush 18 Sep '14

18 Sep '14

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Wed, 17 Sep 2014 23:49:58 UTC Commit: 634a4b111fd14eec9045653bb328c018285aa6ec https://github.com/geany/geany/commit/634a4b111fd14eec9045653bb328c018285aa… Log Message: ----------- Highlight C types from tags in C++ code Useful for when using, for example, GTK+, SDL, and other C-only APIs in files with the C++ filetype. Before only the symbol auto-completion worked, but not the highlighting of type names. TODO: figure out why taking something like SDL.c.tags and making a copy as SDL.cpp.tags doesn't work, once that's fixed, this extra condition could probably be removed. Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -50,6 +50,7 @@ #include "sciwrappers.h" #include "sidebar.h" #include "support.h" +#include "tm_parser.h" #include "tm_tag.h" #include "ui_utils.h" #include "utils.h" @@ -272,7 +273,8 @@ GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types, gin /* the check for tag_lang == lang is necessary to avoid wrong type colouring of * e.g. PHP classes in C++ files * lang = -2 disables the check */ - if (tag->name && (tag_lang == lang || lang == -2)) + if (tag->name && (tag_lang == lang || lang == -2 || + (lang == TM_PARSER_CPP && tag_lang == TM_PARSER_C))) { if (j != 0) g_string_append_c(s, ' '); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 875925: Update of Polish translation
by Frank Lanitz 17 Sep '14

17 Sep '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 17 Sep 2014 18:20:20 UTC Commit: 87592539b4bbbeb2e4117f075c604369ea79a546 https://github.com/geany/geany/commit/87592539b4bbbeb2e4117f075c604369ea79a… Log Message: ----------- Update of Polish translation Modified Paths: -------------- po/pl.po Modified: po/pl.po 2958 lines changed, 1495 insertions(+), 1463 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e42cd4: Merge branch 'scintilla/autoc-sizing'
by Colomban Wendling 15 Sep '14

15 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 15 Sep 2014 14:03:43 UTC Commit: e42cd4d6e920daea6c48512a8d69cc0cc3fc1232 https://github.com/geany/geany/commit/e42cd4d6e920daea6c48512a8d69cc0cc3fc1… Log Message: ----------- Merge branch 'scintilla/autoc-sizing' Backport changes applied upstream to fix auto-completion popup sizing. Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 140 lines changed, 94 insertions(+), 46 deletions(-) =================================================================== @@ -1226,12 +1226,11 @@ Window::~Window() {} void Window::Destroy() { if (wid) { - if (dynamic_cast<ListBox*>(this)) { + ListBox *listbox = dynamic_cast<ListBox*>(this); + if (listbox) { gtk_widget_hide(GTK_WIDGET(wid)); // clear up window content - GtkWidget *child = gtk_bin_get_child(GTK_BIN(wid)); - if (child) - gtk_widget_destroy(child); + listbox->Clear(); // resize the window to the smallest possible size for it to adapt // to future content gtk_window_resize(GTK_WINDOW(wid), 1, 1); @@ -1300,7 +1299,7 @@ void Window::SetPositionRelative(PRectangle rc, Window relativeTo) { gtk_window_move(GTK_WINDOW(PWidget(wid)), ox, oy); - gtk_widget_set_size_request(PWidget(wid), sizex, sizey); + gtk_window_resize(GTK_WINDOW(wid), sizex, sizey); } PRectangle Window::GetClientPosition() { @@ -1424,6 +1423,7 @@ enum { class ListBoxX : public ListBox { WindowID widCached; + WindowID frame; WindowID list; WindowID scroller; void *pixhash; @@ -1436,7 +1436,7 @@ class ListBoxX : public ListBox { CallBackAction doubleClickAction; void *doubleClickActionData; - ListBoxX() : widCached(0), list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), + ListBoxX() : widCached(0), frame(0), list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), desiredVisibleRows(5), maxItemCharacters(0), aveCharWidth(1), doubleClickAction(NULL), doubleClickActionData(NULL) { } @@ -1455,6 +1455,7 @@ class ListBoxX : public ListBox { virtual void SetAverageCharWidth(int width); virtual void SetVisibleRows(int rows); virtual int GetVisibleRows() const; + int GetRowHeight(); virtual PRectangle GetDesiredRect(); virtual int CaretFromEdge(); virtual void Clear(); @@ -1480,6 +1481,35 @@ ListBox *ListBox::Allocate() { return lb; } +// SmallScroller, a GtkScrolledWindow that can shrink very small, as +// gtk_widget_set_size_request() cannot shrink widgets on GTK3 +typedef GtkScrolledWindow SmallScroller; +typedef GtkScrolledWindowClass SmallScrollerClass; + +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); + *min = 1; +} +#else +static void small_scroller_size_request(GtkWidget *widget, GtkRequisition *req) { + GTK_WIDGET_CLASS(small_scroller_parent_class)->size_request(widget, req); + req->height = 1; +} +#endif + +static void small_scroller_class_init(SmallScrollerClass *klass) { +#if GTK_CHECK_VERSION(3,0,0) + GTK_WIDGET_CLASS(klass)->get_preferred_height = small_scroller_get_preferred_height; +#else + GTK_WIDGET_CLASS(klass)->size_request = small_scroller_size_request; +#endif +} + +static void small_scroller_init(SmallScroller *){} + static gboolean ButtonPress(GtkWidget *, GdkEventButton* ev, gpointer p) { try { ListBoxX* lb = reinterpret_cast<ListBoxX*>(p); @@ -1541,18 +1571,20 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { } void ListBoxX::Create(Window &, int, Point, int, bool, int) { - if (widCached == 0) - widCached = gtk_window_new(GTK_WINDOW_POPUP); + if (widCached != 0) { + wid = widCached; + return; + } - wid = widCached; + wid = widCached = gtk_window_new(GTK_WINDOW_POPUP); - GtkWidget *frame = gtk_frame_new(NULL); - gtk_widget_show(frame); - gtk_container_add(GTK_CONTAINER(GetID()), frame); + frame = gtk_frame_new(NULL); + gtk_widget_show(PWidget(frame)); + gtk_container_add(GTK_CONTAINER(GetID()), PWidget(frame)); gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT); gtk_container_set_border_width(GTK_CONTAINER(frame), 0); - scroller = gtk_scrolled_window_new(NULL, NULL); + scroller = g_object_new(small_scroller_get_type(), NULL); gtk_container_set_border_width(GTK_CONTAINER(scroller), 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroller), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); @@ -1598,7 +1630,6 @@ void ListBoxX::Create(Window &, int, Point, int, bool, int) { gtk_widget_show(wid); g_signal_connect(G_OBJECT(wid), "button_press_event", G_CALLBACK(ButtonPress), this); - gtk_widget_realize(PWidget(wid)); } void ListBoxX::SetFont(Font &scint_font) { @@ -1625,6 +1656,21 @@ int ListBoxX::GetVisibleRows() const { return desiredVisibleRows; } +int ListBoxX::GetRowHeight() +{ + 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; +} + PRectangle ListBoxX::GetDesiredRect() { // Before any size allocated pretend its 100 wide so not scrolled PRectangle rc(0, 0, 100, 100); @@ -1634,53 +1680,60 @@ PRectangle ListBoxX::GetDesiredRect() { rows = desiredVisibleRows; GtkRequisition req; -#if GTK_CHECK_VERSION(3,0,0) // This, apparently unnecessary call, ensures gtk_tree_view_column_cell_get_size // returns reasonable values. - gtk_widget_get_preferred_size(GTK_WIDGET(scroller), NULL, &req); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_get_preferred_size(GTK_WIDGET(frame), NULL, &req); +#else + gtk_widget_size_request(GTK_WIDGET(frame), &req); #endif int height; // First calculate height of the clist for our desired visible // row count otherwise it tries to expand to the total # of rows // Get cell height - int row_width=0; - int row_height=0; - GtkTreeViewColumn * column = - gtk_tree_view_get_column(GTK_TREE_VIEW(list), 0); - gtk_tree_view_column_cell_get_size(column, NULL, - NULL, NULL, &row_width, &row_height); + int row_height = GetRowHeight(); #if GTK_CHECK_VERSION(3,0,0) - GtkStyleContext *styleContextList = gtk_widget_get_style_context(PWidget(list)); + GtkStyleContext *styleContextFrame = gtk_widget_get_style_context(PWidget(frame)); GtkBorder padding; - gtk_style_context_get_padding(styleContextList, GTK_STATE_FLAG_NORMAL, &padding); + gtk_style_context_get_padding(styleContextFrame, GTK_STATE_FLAG_NORMAL, &padding); height = (rows * row_height + padding.top + padding.bottom + 2 * (gtk_container_get_border_width(GTK_CONTAINER(PWidget(list))) + 1)); #else - int ythickness = PWidget(list)->style->ythickness; height = (rows * row_height - + 2 * (ythickness - + GTK_CONTAINER(PWidget(list))->border_width + 1)); -#endif - gtk_widget_set_size_request(GTK_WIDGET(PWidget(list)), -1, height); - - // Get the size of the scroller because we set usize on the window -#if GTK_CHECK_VERSION(3,0,0) - gtk_widget_get_preferred_size(GTK_WIDGET(scroller), NULL, &req); -#else - gtk_widget_size_request(GTK_WIDGET(scroller), &req); + + 2 * (PWidget(frame)->style->ythickness + + GTK_CONTAINER(PWidget(list))->border_width)); #endif - rc.right = req.width; - rc.bottom = Platform::Maximum(height, req.height); + rc.bottom = height; - gtk_widget_set_size_request(GTK_WIDGET(list), -1, -1); int width = maxItemCharacters; if (width < 12) width = 12; rc.right = width * (aveCharWidth + aveCharWidth / 3); - if (Length() > rows) - rc.right = rc.right + 16; + // Add horizontal padding and borders + int horizontal_separator=0; + gtk_widget_style_get(PWidget(list), + "horizontal-separator", &horizontal_separator, NULL); + rc.right += horizontal_separator; +#if GTK_CHECK_VERSION(3,0,0) + rc.right += (padding.left + padding.right + + 2 * (gtk_container_get_border_width(GTK_CONTAINER(PWidget(list))) + 1)); +#else + rc.right += 2 * (PWidget(frame)->style->xthickness + + GTK_CONTAINER(PWidget(list))->border_width); +#endif + if (Length() > rows) { + // Add the width of the scrollbar + GtkWidget *vscrollbar = + gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(scroller)); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_get_preferred_size(vscrollbar, NULL, &req); +#else + gtk_widget_size_request(vscrollbar, &req); +#endif + rc.right += req.width; + } } return rc; } @@ -1792,12 +1845,7 @@ void ListBoxX::Select(int n) { + adj->lower - adj->page_size / 2; #endif // Get cell height - int row_width; - int row_height; - GtkTreeViewColumn * column = - gtk_tree_view_get_column(GTK_TREE_VIEW(list), 0); - gtk_tree_view_column_cell_get_size(column, NULL, NULL, - NULL, &row_width, &row_height); + int row_height = GetRowHeight(); int rows = Length(); if ((rows == 0) || (rows > desiredVisibleRows)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e84cf1: Merge branch 'scintilla/gtk3-dead-windows'
by Colomban Wendling 15 Sep '14

15 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 15 Sep 2014 14:03:13 UTC Commit: e84cf128cbf85ffba4fb2176b5ae7057838fe720 https://github.com/geany/geany/commit/e84cf128cbf85ffba4fb2176b5ae7057838fe… Log Message: ----------- Merge branch 'scintilla/gtk3-dead-windows' Backport patches applied upstream to cache auto-completion windows, hopefully avoiding dead popup windows lying around on GTK3 builds in some high stress scenarios. Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 30 lines changed, 25 insertions(+), 5 deletions(-) =================================================================== @@ -1225,9 +1225,21 @@ Surface *Surface::Allocate(int) { Window::~Window() {} void Window::Destroy() { - if (wid) - gtk_widget_destroy(GTK_WIDGET(wid)); - wid = 0; + if (wid) { + if (dynamic_cast<ListBox*>(this)) { + gtk_widget_hide(GTK_WIDGET(wid)); + // clear up window content + GtkWidget *child = gtk_bin_get_child(GTK_BIN(wid)); + if (child) + gtk_widget_destroy(child); + // resize the window to the smallest possible size for it to adapt + // to future content + gtk_window_resize(GTK_WINDOW(wid), 1, 1); + } else { + gtk_widget_destroy(GTK_WIDGET(wid)); + } + wid = 0; + } } bool Window::HasFocus() { @@ -1411,6 +1423,7 @@ enum { }; class ListBoxX : public ListBox { + WindowID widCached; WindowID list; WindowID scroller; void *pixhash; @@ -1423,7 +1436,7 @@ class ListBoxX : public ListBox { CallBackAction doubleClickAction; void *doubleClickActionData; - ListBoxX() : list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), + ListBoxX() : widCached(0), list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), desiredVisibleRows(5), maxItemCharacters(0), aveCharWidth(1), doubleClickAction(NULL), doubleClickActionData(NULL) { } @@ -1432,6 +1445,10 @@ class ListBoxX : public ListBox { g_hash_table_foreach((GHashTable *) pixhash, list_image_free, NULL); g_hash_table_destroy((GHashTable *) pixhash); } + if (widCached) { + gtk_widget_destroy(GTK_WIDGET(widCached)); + wid = widCached = 0; + } } virtual void SetFont(Font &font); virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_); @@ -1524,7 +1541,10 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { } void ListBoxX::Create(Window &, int, Point, int, bool, int) { - wid = gtk_window_new(GTK_WINDOW_POPUP); + if (widCached == 0) + widCached = gtk_window_new(GTK_WINDOW_POPUP); + + wid = widCached; GtkWidget *frame = gtk_frame_new(NULL); gtk_widget_show(frame); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 61eaf2: GTK: Fix auto-completion popup height to better fit contents
by Colomban Wendling 15 Sep '14

15 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 15 Sep 2014 13:58:42 UTC Commit: 61eaf23a266d3fa0d00e3d148b1d128906b46fac https://github.com/geany/geany/commit/61eaf23a266d3fa0d00e3d148b1d128906b46… Log Message: ----------- GTK: Fix auto-completion popup height to better fit contents Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 52 lines changed, 30 insertions(+), 22 deletions(-) =================================================================== @@ -1226,12 +1226,11 @@ Window::~Window() {} void Window::Destroy() { if (wid) { - if (dynamic_cast<ListBox*>(this)) { + ListBox *listbox = dynamic_cast<ListBox*>(this); + if (listbox) { gtk_widget_hide(GTK_WIDGET(wid)); // clear up window content - GtkWidget *child = gtk_bin_get_child(GTK_BIN(wid)); - if (child) - gtk_widget_destroy(child); + listbox->Clear(); // resize the window to the smallest possible size for it to adapt // to future content gtk_window_resize(GTK_WINDOW(wid), 1, 1); @@ -1455,6 +1454,7 @@ class ListBoxX : public ListBox { virtual void SetAverageCharWidth(int width); virtual void SetVisibleRows(int rows); virtual int GetVisibleRows() const; + int GetRowHeight(); virtual PRectangle GetDesiredRect(); virtual int CaretFromEdge(); virtual void Clear(); @@ -1541,10 +1541,12 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { } void ListBoxX::Create(Window &, int, Point, int, bool, int) { - if (widCached == 0) - widCached = gtk_window_new(GTK_WINDOW_POPUP); + if (widCached != 0) { + wid = widCached; + return; + } - wid = widCached; + wid = widCached = gtk_window_new(GTK_WINDOW_POPUP); GtkWidget *frame = gtk_frame_new(NULL); gtk_widget_show(frame); @@ -1598,7 +1600,6 @@ void ListBoxX::Create(Window &, int, Point, int, bool, int) { gtk_widget_show(wid); g_signal_connect(G_OBJECT(wid), "button_press_event", G_CALLBACK(ButtonPress), this); - gtk_widget_realize(PWidget(wid)); } void ListBoxX::SetFont(Font &scint_font) { @@ -1625,6 +1626,21 @@ int ListBoxX::GetVisibleRows() const { return desiredVisibleRows; } +int ListBoxX::GetRowHeight() +{ + 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; +} + PRectangle ListBoxX::GetDesiredRect() { // Before any size allocated pretend its 100 wide so not scrolled PRectangle rc(0, 0, 100, 100); @@ -1634,22 +1650,19 @@ PRectangle ListBoxX::GetDesiredRect() { rows = desiredVisibleRows; GtkRequisition req; -#if GTK_CHECK_VERSION(3,0,0) // This, apparently unnecessary call, ensures gtk_tree_view_column_cell_get_size // returns reasonable values. +#if GTK_CHECK_VERSION(3,0,0) gtk_widget_get_preferred_size(GTK_WIDGET(scroller), NULL, &req); +#else + gtk_widget_size_request(GTK_WIDGET(scroller), &req); #endif int height; // First calculate height of the clist for our desired visible // row count otherwise it tries to expand to the total # of rows // Get cell height - int row_width=0; - int row_height=0; - GtkTreeViewColumn * column = - gtk_tree_view_get_column(GTK_TREE_VIEW(list), 0); - gtk_tree_view_column_cell_get_size(column, NULL, - NULL, NULL, &row_width, &row_height); + int row_height = GetRowHeight(); #if GTK_CHECK_VERSION(3,0,0) GtkStyleContext *styleContextList = gtk_widget_get_style_context(PWidget(list)); GtkBorder padding; @@ -1661,7 +1674,7 @@ PRectangle ListBoxX::GetDesiredRect() { int ythickness = PWidget(list)->style->ythickness; height = (rows * row_height + 2 * (ythickness - + GTK_CONTAINER(PWidget(list))->border_width + 1)); + + GTK_CONTAINER(PWidget(list))->border_width)); #endif gtk_widget_set_size_request(GTK_WIDGET(PWidget(list)), -1, height); @@ -1792,12 +1805,7 @@ void ListBoxX::Select(int n) { + adj->lower - adj->page_size / 2; #endif // Get cell height - int row_width; - int row_height; - GtkTreeViewColumn * column = - gtk_tree_view_get_column(GTK_TREE_VIEW(list), 0); - gtk_tree_view_column_cell_get_size(column, NULL, NULL, - NULL, &row_width, &row_height); + int row_height = GetRowHeight(); int rows = Length(); if ((rows == 0) || (rows > desiredVisibleRows)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d1e519: GTK: Fix auto-completion popup width to better fit contents
by Colomban Wendling 15 Sep '14

15 Sep '14

1 0

[geany/geany] 069e2d: GTK: Fix auto-completion popup sizing on some themes
by Colomban Wendling 15 Sep '14

15 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 15 Sep 2014 13:58:42 UTC Commit: 069e2d4ec56f84436682cddfe06e6b4ca9d0576c https://github.com/geany/geany/commit/069e2d4ec56f84436682cddfe06e6b4ca9d05… Log Message: ----------- GTK: Fix auto-completion popup sizing on some themes Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 22 lines changed, 11 insertions(+), 11 deletions(-) =================================================================== @@ -1423,6 +1423,7 @@ enum { class ListBoxX : public ListBox { WindowID widCached; + WindowID frame; WindowID list; WindowID scroller; void *pixhash; @@ -1435,7 +1436,7 @@ class ListBoxX : public ListBox { CallBackAction doubleClickAction; void *doubleClickActionData; - ListBoxX() : widCached(0), list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), + ListBoxX() : widCached(0), frame(0), list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), desiredVisibleRows(5), maxItemCharacters(0), aveCharWidth(1), doubleClickAction(NULL), doubleClickActionData(NULL) { } @@ -1577,9 +1578,9 @@ void ListBoxX::Create(Window &, int, Point, int, bool, int) { wid = widCached = gtk_window_new(GTK_WINDOW_POPUP); - GtkWidget *frame = gtk_frame_new(NULL); - gtk_widget_show(frame); - gtk_container_add(GTK_CONTAINER(GetID()), frame); + frame = gtk_frame_new(NULL); + gtk_widget_show(PWidget(frame)); + gtk_container_add(GTK_CONTAINER(GetID()), PWidget(frame)); gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT); gtk_container_set_border_width(GTK_CONTAINER(frame), 0); @@ -1682,9 +1683,9 @@ PRectangle ListBoxX::GetDesiredRect() { // This, apparently unnecessary call, ensures gtk_tree_view_column_cell_get_size // returns reasonable values. #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_get_preferred_size(GTK_WIDGET(scroller), NULL, &req); + gtk_widget_get_preferred_size(GTK_WIDGET(frame), NULL, &req); #else - gtk_widget_size_request(GTK_WIDGET(scroller), &req); + gtk_widget_size_request(GTK_WIDGET(frame), &req); #endif int height; @@ -1693,16 +1694,15 @@ PRectangle ListBoxX::GetDesiredRect() { // Get cell height int row_height = GetRowHeight(); #if GTK_CHECK_VERSION(3,0,0) - GtkStyleContext *styleContextList = gtk_widget_get_style_context(PWidget(list)); + GtkStyleContext *styleContextFrame = gtk_widget_get_style_context(PWidget(frame)); GtkBorder padding; - gtk_style_context_get_padding(styleContextList, GTK_STATE_FLAG_NORMAL, &padding); + gtk_style_context_get_padding(styleContextFrame, GTK_STATE_FLAG_NORMAL, &padding); height = (rows * row_height + padding.top + padding.bottom + 2 * (gtk_container_get_border_width(GTK_CONTAINER(PWidget(list))) + 1)); #else - int ythickness = PWidget(list)->style->ythickness; height = (rows * row_height - + 2 * (ythickness + + 2 * (PWidget(frame)->style->ythickness + GTK_CONTAINER(PWidget(list))->border_width)); #endif rc.bottom = height; @@ -1720,7 +1720,7 @@ PRectangle ListBoxX::GetDesiredRect() { rc.right += (padding.left + padding.right + 2 * (gtk_container_get_border_width(GTK_CONTAINER(PWidget(list))) + 1)); #else - rc.right += 2 * (PWidget(list)->style->xthickness + rc.right += 2 * (PWidget(frame)->style->xthickness + GTK_CONTAINER(PWidget(list))->border_width); #endif if (Length() > rows) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4d66bd: GTK: Allow the auto-completion popup to be as small as needed
by Colomban Wendling 15 Sep '14

15 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 15 Sep 2014 13:58:42 UTC Commit: 4d66bd3745eb3759539b116e7784d11d035ebd44 https://github.com/geany/geany/commit/4d66bd3745eb3759539b116e7784d11d035eb… Log Message: ----------- GTK: Allow the auto-completion popup to be as small as needed Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 45 lines changed, 32 insertions(+), 13 deletions(-) =================================================================== @@ -1299,7 +1299,7 @@ void Window::SetPositionRelative(PRectangle rc, Window relativeTo) { gtk_window_move(GTK_WINDOW(PWidget(wid)), ox, oy); - gtk_widget_set_size_request(PWidget(wid), sizex, sizey); + gtk_window_resize(GTK_WINDOW(wid), sizex, sizey); } PRectangle Window::GetClientPosition() { @@ -1480,6 +1480,35 @@ ListBox *ListBox::Allocate() { return lb; } +// SmallScroller, a GtkScrolledWindow that can shrink very small, as +// gtk_widget_set_size_request() cannot shrink widgets on GTK3 +typedef GtkScrolledWindow SmallScroller; +typedef GtkScrolledWindowClass SmallScrollerClass; + +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); + *min = 1; +} +#else +static void small_scroller_size_request(GtkWidget *widget, GtkRequisition *req) { + GTK_WIDGET_CLASS(small_scroller_parent_class)->size_request(widget, req); + req->height = 1; +} +#endif + +static void small_scroller_class_init(SmallScrollerClass *klass) { +#if GTK_CHECK_VERSION(3,0,0) + GTK_WIDGET_CLASS(klass)->get_preferred_height = small_scroller_get_preferred_height; +#else + GTK_WIDGET_CLASS(klass)->size_request = small_scroller_size_request; +#endif +} + +static void small_scroller_init(SmallScroller *){} + static gboolean ButtonPress(GtkWidget *, GdkEventButton* ev, gpointer p) { try { ListBoxX* lb = reinterpret_cast<ListBoxX*>(p); @@ -1554,7 +1583,7 @@ void ListBoxX::Create(Window &, int, Point, int, bool, int) { gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT); gtk_container_set_border_width(GTK_CONTAINER(frame), 0); - scroller = gtk_scrolled_window_new(NULL, NULL); + scroller = g_object_new(small_scroller_get_type(), NULL); gtk_container_set_border_width(GTK_CONTAINER(scroller), 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroller), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); @@ -1676,18 +1705,8 @@ PRectangle ListBoxX::GetDesiredRect() { + 2 * (ythickness + GTK_CONTAINER(PWidget(list))->border_width)); #endif - gtk_widget_set_size_request(GTK_WIDGET(PWidget(list)), -1, height); - - // Get the size of the scroller because we set usize on the window -#if GTK_CHECK_VERSION(3,0,0) - gtk_widget_get_preferred_size(GTK_WIDGET(scroller), NULL, &req); -#else - gtk_widget_size_request(GTK_WIDGET(scroller), &req); -#endif - rc.right = req.width; - rc.bottom = Platform::Maximum(height, req.height); + rc.bottom = height; - gtk_widget_set_size_request(GTK_WIDGET(list), -1, -1); int width = maxItemCharacters; if (width < 12) width = 12; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 93c9e2: Merge pull request #331 from scriptum/rpg-translate-ru
by Frank Lanitz 12 Sep '14

12 Sep '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 12 Sep 2014 17:34:11 UTC Commit: 93c9e2ce860d09e74b642ef50a6961d91f3177e5 https://github.com/geany/geany/commit/93c9e2ce860d09e74b642ef50a6961d91f317… Log Message: ----------- Merge pull request #331 from scriptum/rpg-translate-ru Update of Russian translation Modified Paths: -------------- po/ru.po Modified: po/ru.po 2923 lines changed, 1491 insertions(+), 1432 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 683c38: Update of Russian translation
by Pavel Roschin 12 Sep '14

12 Sep '14

Branch: refs/heads/master Author: Pavel Roschin <roshin(a)scriptumplus.ru> Committer: Pavel Roschin <roshin(a)scriptumplus.ru> Date: Fri, 12 Sep 2014 15:14:38 UTC Commit: 683c380d10d828e10c7be98d793ddc9425be32ea https://github.com/geany/geany/commit/683c380d10d828e10c7be98d793ddc9425be3… Log Message: ----------- Update of Russian translation Modified Paths: -------------- po/ru.po Modified: po/ru.po 2923 lines changed, 1491 insertions(+), 1432 deletions(-) =================================================================== No diff available, check online -------------- 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 September 2014