summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 02:22:08 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 02:22:08 +0000
commit954f37d9b4b99e38c9fef926ac39607804735589 (patch)
treeac2326ebe7fa01a147148cff91c237558bc9a9a8
parentae99807ee9ea508fc9fd3af01c8d52baf2e2c206 (diff)
downloadchromium_src-954f37d9b4b99e38c9fef926ac39607804735589.zip
chromium_src-954f37d9b4b99e38c9fef926ac39607804735589.tar.gz
chromium_src-954f37d9b4b99e38c9fef926ac39607804735589.tar.bz2
Fix a bug that caused some Chinese characters be shown at lower positions.
For some reason, Chinese characters like 时 \u65F6 are shown at wrong positions lower than it should be (see the screenshot in crosbug.com/2303). The root cause seemed be that pango_layout_get_pixel_size() returned larger height values for certain characters, but hopefully, I found that we can fix the rendering weirdness by changing the grid layout alighment. Along the way, change the logging behavior from APPEND_TO_OLD_LOG_FILE to DELETE_OLD_LOG_FILE, as appending causes more confusion than it helps. BUG=chromium-os:2303 TEST=manually on the netbook Review URL: http://codereview.chromium.org/2254001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48242 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/text_input/candidate_window.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/text_input/candidate_window.cc b/chrome/browser/chromeos/text_input/candidate_window.cc
index c61dfc1..317a6e0 100644
--- a/chrome/browser/chromeos/text_input/candidate_window.cc
+++ b/chrome/browser/chromeos/text_input/candidate_window.cc
@@ -431,10 +431,10 @@ void CandidateView::Init() {
// Initialize the column set with two columns.
views::ColumnSet* column_set = layout->AddColumnSet(0);
- column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING,
+ column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
0, views::GridLayout::USE_PREF, 0, 0);
column_set->AddPaddingColumn(0, 4);
- column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING,
+ column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
0, views::GridLayout::USE_PREF, 0, 0);
column_set->AddPaddingColumn(0, 4);
@@ -1004,7 +1004,7 @@ int main(int argc, char** argv) {
logging::InitLogging(log_file_name.c_str(),
logging::LOG_ONLY_TO_FILE,
logging::DONT_LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE);
+ logging::DELETE_OLD_LOG_FILE);
// Redirect stderr to log_file_name. This is neeed to capture the
// logging from libcros.so.
if (!freopen(log_file_name.c_str(), "a", stderr)) {