Commit 043f595a authored by deanm@chromium.org's avatar deanm@chromium.org

Fix a small undercalculation of the space available a result description.

Calculate from the actual text width, not the allocated text width.

Review URL: http://codereview.chromium.org/99222


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15042 0039d316-1c4b-4281-b951-d872f2087c98
parent bcdcb3e0
...@@ -440,9 +440,9 @@ gboolean AutocompletePopupViewGtk::HandleExpose(GtkWidget* widget, ...@@ -440,9 +440,9 @@ gboolean AutocompletePopupViewGtk::HandleExpose(GtkWidget* widget,
// if there is also a description to be shown. // if there is also a description to be shown.
bool has_description = !match.description.empty(); bool has_description = !match.description.empty();
int text_width = window_rect.width() - (kIconAreaWidth + kRightPadding); int text_width = window_rect.width() - (kIconAreaWidth + kRightPadding);
int content_width = has_description ? int allocated_content_width = has_description ?
text_width * kContentWidthPercentage : text_width; text_width * kContentWidthPercentage : text_width;
pango_layout_set_width(layout_, content_width * PANGO_SCALE); pango_layout_set_width(layout_, allocated_content_width * PANGO_SCALE);
SetupLayoutForMatch(layout_, match.contents, match.contents_class, SetupLayoutForMatch(layout_, match.contents, match.contents_class,
&kContentTextColor, std::string()); &kContentTextColor, std::string());
...@@ -464,7 +464,7 @@ gboolean AutocompletePopupViewGtk::HandleExpose(GtkWidget* widget, ...@@ -464,7 +464,7 @@ gboolean AutocompletePopupViewGtk::HandleExpose(GtkWidget* widget,
if (has_description) { if (has_description) {
pango_layout_set_width(layout_, pango_layout_set_width(layout_,
(text_width - content_width) * PANGO_SCALE); (text_width - actual_content_width) * PANGO_SCALE);
SetupLayoutForMatch(layout_, match.description, match.description_class, SetupLayoutForMatch(layout_, match.description, match.description_class,
is_selected ? &kDescriptionSelectedTextColor : is_selected ? &kDescriptionSelectedTextColor :
&kDescriptionTextColor, &kDescriptionTextColor,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment