zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix edit control width calculation on GTK3. 

Also, bring the GTK2 width calculation in line with the GTK3 one.
pull/4/head
whitequark 2016-04-18 06:21:35 +00:00
parent 6cb6a2cf27
commit 1142f85ff5
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/gtkmain.cpp
View File

@ -387,7 +387,13 @@ public:
font_desc.set_absolute_size(font_height * Pango::SCALE); font_desc.set_absolute_size(font_height * Pango::SCALE);
#ifdef HAVE_GTK3 #ifdef HAVE_GTK3
_entry.override_font(font_desc); /* For some reason override_font doesn't take screen DPI into
account on GTK3 when working with font descriptors specified
in absolute sizes; modify_font does on GTK2. */
Pango::FontDescription override_font_desc(font_desc);
double dpi = get_screen()->get_resolution();
override_font_desc.set_size(font_height * 72.0 / dpi * Pango::SCALE);
_entry.override_font(override_font_desc);
#else #else
_entry.modify_font(font_desc); _entry.modify_font(font_desc);
#endif #endif
@ -399,12 +405,13 @@ public:
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(get_pango_context()); Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(get_pango_context());
layout->set_font_description(font_desc); layout->set_font_description(font_desc);
layout->set_text(val + " "); /* avoid scrolling */ layout->set_text(val + " "); /* avoid scrolling */
int width = std::max(minWidthChars * font_metrics.get_approximate_char_width(), int width = layout->get_logical_extents().get_width();
layout->get_logical_extents().get_width()) / Pango::SCALE;
#ifdef HAVE_GTK3 #ifdef HAVE_GTK3
Gtk::Border border = _entry.get_style_context()->get_padding(); Gtk::Border border = _entry.get_style_context()->get_padding();
move(_entry, x - border.get_left(), y - border.get_top()); move(_entry, x - border.get_left(), y - border.get_top());
_entry.set_width_chars(minWidthChars);
_entry.set_size_request(width / Pango::SCALE, -1);
#else #else
/* We need _gtk_entry_effective_inner_border, but it's not /* We need _gtk_entry_effective_inner_border, but it's not
in the public API, so emulate its logic. */ in the public API, so emulate its logic. */
@ -413,10 +420,13 @@ public:
&style_border, NULL); &style_border, NULL);
if(style_border) border = *style_border; if(style_border) border = *style_border;
move(_entry, x - border.left, y - border.top); move(_entry, x - border.left, y - border.top);
/* This is what set_width_chars does. */
int minWidth = minWidthChars * std::max(font_metrics.get_approximate_digit_width(),
font_metrics.get_approximate_char_width());
_entry.set_size_request(std::max(width, minWidth) / Pango::SCALE, -1);
#endif #endif
_entry.set_text(val); _entry.set_text(val);
_entry.set_size_request(width, -1);
if(!_entry.is_visible()) { if(!_entry.is_visible()) {
_entry.show(); _entry.show();
_entry.grab_focus(); _entry.grab_focus();