blob: 46acc6092ef557842234bf339b8fdbca35e8f088 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- ui/gfx/render_text.cc.orig 2017-04-19 19:06:54 UTC
+++ ui/gfx/render_text.cc
@@ -976,32 +976,33 @@ void RenderText::SetDisplayOffset(int ho
const int extra_content = GetContentWidth() - display_rect_.width();
const int cursor_width = cursor_enabled_ ? 1 : 0;
- int min_offset = 0;
- int max_offset = 0;
+ // avoid collisions with vm_map.h on FreeBSD --cmt
+ int _min_offset = 0;
+ int _max_offset = 0;
if (extra_content > 0) {
switch (GetCurrentHorizontalAlignment()) {
case ALIGN_LEFT:
- min_offset = -extra_content;
+ _min_offset = -extra_content;
break;
case ALIGN_RIGHT:
- max_offset = extra_content;
+ _max_offset = extra_content;
break;
case ALIGN_CENTER:
// The extra space reserved for cursor at the end of the text is ignored
// when centering text. So, to calculate the valid range for offset, we
// exclude that extra space, calculate the range, and add it back to the
// range (if cursor is enabled).
- min_offset = -(extra_content - cursor_width + 1) / 2 - cursor_width;
- max_offset = (extra_content - cursor_width) / 2;
+ _min_offset = -(extra_content - cursor_width + 1) / 2 - cursor_width;
+ _max_offset = (extra_content - cursor_width) / 2;
break;
default:
break;
}
}
- if (horizontal_offset < min_offset)
- horizontal_offset = min_offset;
- else if (horizontal_offset > max_offset)
- horizontal_offset = max_offset;
+ if (horizontal_offset < _min_offset)
+ horizontal_offset = _min_offset;
+ else if (horizontal_offset > _max_offset)
+ horizontal_offset = _max_offset;
cached_bounds_and_offset_valid_ = true;
display_offset_.set_x(horizontal_offset);
|
