• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision662b9029ea2a3accd2114e49b91587e4e87c7a5e (tree)
Zeit2012-10-30 17:34:46
Autorangeart <angeart@git....>
Commiterangeart

Log Message

Inputの挙動の修正

Ändern Zusammenfassung

Diff

Binary files a/client/scene/Title.cpp and b/client/scene/Title.cpp differ
--- a/client/ui/Input.cpp
+++ b/client/ui/Input.cpp
@@ -642,7 +642,7 @@ void Input::ProcessInput(InputManager* input)
642642 if (push_mouse_left && !prev_mouse_left) {
643643 auto mpos = input->GetMousePos();
644644 auto offset_x = mpos.first - (x_ + INPUT_MARGIN_X);
645- auto offset_y = mpos.second - (y_ + INPUT_MARGIN_Y);
645+ auto offset_y = mpos.second - (y_ + INPUT_MARGIN_Y) + ResourceManager::default_font_size() * message_lines_.size();
646646 // カレット変更
647647 if( multiline_ ) {
648648 auto line_num = offset_y / font_height_;
@@ -688,7 +688,7 @@ void Input::ProcessInput(InputManager* input)
688688 }
689689 auto mpos = input->GetMousePos();
690690 auto offset_x = mpos.first - (x_ + INPUT_MARGIN_X);
691- auto offset_y = mpos.second - (y_ + INPUT_MARGIN_Y);
691+ auto offset_y = mpos.second - (y_ + INPUT_MARGIN_Y) + ResourceManager::default_font_size() * message_lines_.size();
692692 // カレット変更
693693 if( multiline_ ) {
694694 auto line_num = offset_y / font_height_;
@@ -740,7 +740,7 @@ void Input::ProcessInput(InputManager* input)
740740 if( push_mouse_left ){
741741 auto mpos = input->GetMousePos();
742742 auto offset_x = mpos.first - (x_ + INPUT_MARGIN_X);
743- auto offset_y = mpos.second - (y_ + INPUT_MARGIN_Y);
743+ auto offset_y = mpos.second - (y_ + INPUT_MARGIN_Y) + ResourceManager::default_font_size() * message_lines_.size();
744744 // カレット変更
745745 if( multiline_ ) {
746746 auto line_num = offset_y / font_height_;