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

GTK: take margin and border size into account when positioning entry.

pull/216/head
whitequark 2017-03-04 00:05:49 +00:00
parent 91574254fe
commit 8e27a5e34b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/platform/gtkmain.cpp
View File

@ -249,10 +249,16 @@ public:
layout->set_text(val + " "); /* avoid scrolling */ layout->set_text(val + " "); /* avoid scrolling */
int width = layout->get_logical_extents().get_width(); int width = layout->get_logical_extents().get_width();
Gtk::Border border = _entry.get_style_context()->get_padding(); Gtk::Border margin = _entry.get_style_context()->get_margin();
move(_entry, x - border.get_left(), y - border.get_top()); Gtk::Border border = _entry.get_style_context()->get_border();
Gtk::Border padding = _entry.get_style_context()->get_padding();
move(_entry,
x - margin.get_left() - border.get_left() - padding.get_left(),
y - margin.get_top() - border.get_top() - padding.get_top());
_entry.set_width_chars(minWidthChars); _entry.set_width_chars(minWidthChars);
_entry.set_size_request(width / Pango::SCALE, -1); _entry.set_size_request(
width / Pango::SCALE + padding.get_left() + padding.get_right(),
-1);
_entry.set_text(val); _entry.set_text(val);
if(!_entry.is_visible()) { if(!_entry.is_visible()) {