HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GTK: Fix auto-completion popup width to better fit contents

Browse Source
This commit is contained in:
Colomban Wendling 2014-09-11 14:37:20 +02:00
parent 61eaf23a26
commit d1e519c11d
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scintilla/gtk/PlatGTK.cxx
View File

@ -1692,8 +1692,29 @@ PRectangle ListBoxX::GetDesiredRect() {
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(list)->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;
}