Commit: e6756353200e20fe86b5155ea83c7ccaeb7d3b07 - main (git)

Commit MetaInfo

• Révision: e6756353200e20fe86b5155ea83c7ccaeb7d3b07 (tree)
• l'heure: 2012-09-04 03:23:59
• Auteur: h2so5 <h2so5@git....>
• Commiter: h2so5

Message de Log

InputとUILabelの改行時の不具合を修正

Change Summary

• modified: client/ui/Input.cpp
• modified: client/ui/Input.hpp
• modified: client/ui/UILabel.cpp
• modified: client/ui/UILabel.hpp

Modification

--- a/client/ui/Input.cpp
+++ b/client/ui/Input.cpp
@@ -150,7 +150,7 @@ void Input::Draw()
                 auto line = *it;
                 SetDrawBlendMode(DX_BLENDMODE_ALPHA, 140);
                 DrawStringToHandle(internal_x,
-                    internal_y + current_line * font_height_ - 3, unicode::ToTString(line).c_str(),
+                    internal_y + current_line * font_height_ - 3, line.c_str(),
                         text_color, font_handle_);
                 SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
                 current_line++;
@@ -160,7 +160,7 @@ void Input::Draw()
         for (auto it = lines_.begin(); it != lines_.end(); ++it) {
             auto line = *it;
             DrawStringToHandle(internal_x, internal_y + current_line * font_height_,
-                    unicode::ToTString(line).c_str(), text_color, font_handle_);
+                    line.c_str(), text_color, font_handle_);
             current_line++;
         }
 
@@ -190,7 +190,7 @@ void Input::Draw()
             int height = (end_index - start_index) * font_height_;
 
             for (int i = start_index; i < end_index; i++) {
-                auto candidate = unicode::ToTString(candidates_[i]);
+                auto candidate = candidates_[i];
                 width = std::max(width,
                         GetDrawStringWidthToHandle(candidate.c_str(),
                                 candidate.size(), font_handle_));
@@ -250,7 +250,7 @@ void Input::Draw()
                 }
                 DrawStringToHandle(internal_x + x,
                         internal_y + line_top + y,
-                        unicode::ToTString(candidates_[i]).c_str(), GetColor(0, 0, 0),
+                        candidates_[i].c_str(), GetColor(0, 0, 0),
                         font_handle_);
                 line_top += font_height_;
             }
@@ -327,7 +327,7 @@ void Input::ProcessInput(InputManager* input)
         tstring cursor_back_str = buffer.substr(pos);           // カーソル後の文字列
         auto new_string = cursor_front_str + _T('\n') + cursor_back_str;
 
-        SetKeyInputString(unicode::ToTString(new_string).c_str(), input_handle_);
+        SetKeyInputString(new_string.c_str(), input_handle_);
         SetKeyInputCursorPosition(pos + 1, input_handle_);
         CancelSelect();
         cursor_drag_count_ = 0;
@@ -355,7 +355,7 @@ void Input::ProcessInput(InputManager* input)
 
     if (message_.size() > 0) {
         int current_line = 0;
-        std::string line_buffer;
+        tstring line_buffer;
         int line_width = 0;
         int char_count = 0;
         for (auto it = message_.begin(); it != message_.end(); ++it) {
@@ -363,7 +363,7 @@ void Input::ProcessInput(InputManager* input)
         #ifdef UNICODE
             TCHAR c = *it;
             int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
-            line_buffer += unicode::ToString(tstring(&c, 1));
+            line_buffer += c;
         #else
             unsigned char c = *it;
             TCHAR string[2] = { 0, 0 };
@@ -390,6 +390,9 @@ void Input::ProcessInput(InputManager* input)
             line_width += width;
             if (c == _T('\n')
                     || line_width > internal_width - font_height_ / 2) {
+                if (!line_buffer.empty() && line_buffer.back() == _T('\n')) {
+                    line_buffer.pop_back();
+                }
                 message_lines_.push_back(line_buffer);
                 current_line++;
                 line_buffer.clear();
@@ -454,7 +457,7 @@ void Input::ProcessInput(InputManager* input)
             std::swap(select_start, select_end);
         }
 
-        std::string line_buffer;
+        tstring line_buffer;
         int line_width = 0;
         int char_count = 0;
 
@@ -467,7 +470,7 @@ void Input::ProcessInput(InputManager* input)
         #ifdef UNICODE
             TCHAR c = *it;
             int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
-            line_buffer += unicode::ToString(tstring(&c, 1));
+            line_buffer += c;
         #else
             unsigned char c = *it;
             TCHAR string[2] = { 0, 0 };
@@ -513,6 +516,10 @@ void Input::ProcessInput(InputManager* input)
 
             line_width += width;
             if (c == _T('\n') || line_width > internal_width - font_height_ / 2) {
+                if (!line_buffer.empty() && line_buffer.back() == _T('\n')) {
+                    line_buffer.pop_back();
+                }
+
                 lines_.push_back(line_buffer);
 
                 if (cursor_moveto_x_ >= line_width
@@ -544,7 +551,7 @@ void Input::ProcessInput(InputManager* input)
         #ifdef UNICODE
             TCHAR c = *it;
             int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
-            line_buffer += unicode::ToString(tstring(&c, 1));
+            line_buffer += tstring(&c, 1);
         #else
             unsigned char c = *it;
             TCHAR string[2] = { 0, 0 };
@@ -603,7 +610,7 @@ void Input::ProcessInput(InputManager* input)
         #ifdef UNICODE
             TCHAR c = *it;
             int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
-            line_buffer += unicode::ToString(tstring(&c, 1));
+            line_buffer += tstring(&c, 1);
         #else
             unsigned char c = *it;
             TCHAR string[2] = { 0, 0 };
@@ -649,6 +656,9 @@ void Input::ProcessInput(InputManager* input)
 
             line_width += width;
             if (c == _T('\n') || line_width > internal_width - font_height_ / 2) {
+                if (!line_buffer.empty() && line_buffer.back() == _T('\n')) {
+                    line_buffer.pop_back();
+                }
                 lines_.push_back(line_buffer);
 
                 if (cursor_moveto_x_ >= line_width

--- a/client/ui/Input.hpp
+++ b/client/ui/Input.hpp
@@ -57,8 +57,8 @@ class Input {
 
         int input_handle_, font_handle_, font_height_;
 
-        std::vector<std::string> message_lines_;
-        std::vector<std::string> lines_;
+        std::vector<tstring> message_lines_;
+        std::vector<tstring> lines_;
         std::vector<tstring> candidates_;
 
         int candidate_x_, candidate_y_;

--- a/client/ui/UILabel.cpp
+++ b/client/ui/UILabel.cpp
@@ -32,25 +32,30 @@ UILabel::~UILabel()
 
 void UILabel::set_text(const tstring& text)
 {
-    text_ = unicode::ToString(text);
+    text_ = text;
 
     // 文字幅を計算
     char_width_list_.clear();
     for (auto it = text_.begin(); it != text_.end(); ++it) {
-        unsigned char c = *it;
-        TCHAR string[2] = {0, 0};
-
-        int width;
-        if (((c>=0x81 && c<=0x9f) || (c>=0xe0 && c<=0xfc)) && (it + 1) != text_.end()) {
-            string[0] = c;
-            string[1] = *(it + 1);
-            ++it;
-            width = GetDrawStringWidthToHandle(string, 2, font_handle_);
-        } else {
-            string[0] = c;
-            width = GetDrawStringWidthToHandle(string, 1, font_handle_);
-        }
-        char_width_list_.push_back(width);
+        #ifdef UNICODE
+            TCHAR c = *it;
+            int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
+        #else
+            unsigned char c = *it;
+            TCHAR string[2] = {0, 0};
+
+            int width;
+            if (((c>=0x81 && c<=0x9f) || (c>=0xe0 && c<=0xfc)) && (it + 1) != text_.end()) {
+                string[0] = c;
+                string[1] = *(it + 1);
+                ++it;
+                width = GetDrawStringWidthToHandle(string, 2, font_handle_);
+            } else {
+                string[0] = c;
+                width = GetDrawStringWidthToHandle(string, 1, font_handle_);
+            }
+        #endif
+            char_width_list_.push_back(width);
     }
 }
 
@@ -220,7 +225,7 @@ void UILabel::UpdatePosition()
     auto text_cursor = 0;
 
     for (auto it = char_width_list_.begin(); it != char_width_list_.end(); ++it) {
-        if ( text_[text_cursor] == '\n') {
+        if ( text_[text_cursor] == _T('\n')) {
             line_num++;
             substr_list_.push_back(text_cursor);
             substr_list_.push_back(text_cursor + 1);
@@ -233,12 +238,7 @@ void UILabel::UpdatePosition()
             line_width += *it;
         }
 
-        unsigned char c = text_[text_cursor];
-        if ((c>=0x81 && c<=0x9f) || (c>=0xe0 && c<=0xfc)) {
-            text_cursor += 2;
-        } else {
-            text_cursor++;
-        }
+        text_cursor++;
     }
 
 //    if (!stable_width) {

--- a/client/ui/UILabel.hpp
+++ b/client/ui/UILabel.hpp
@@ -41,7 +41,7 @@ class UILabel : public UIBase {
         void UpdatePosition();
 
     private:
-        std::string text_;
+        tstring text_;
         std::vector<int> substr_list_;
         std::vector<int> char_width_list_;
         int font_handle_;