• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Commit MetaInfo

Revisionfb6cb99cec98522b70040ffe060e4deb7564548c (tree)
Time2012-10-29 23:51:25
Authorangeart <angeart@git....>
Commiterangeart

Log Message

コピペ機能の修正

Change Summary

Incremental Difference

--- a/client/ui/Input.cpp
+++ b/client/ui/Input.cpp
@@ -632,7 +632,8 @@ void Input::ProcessInput(InputManager* input)
632632 message_lines_.push_back(line_buffer);
633633 }
634634
635- if (active()) {
635+ if (active() && input->GetMouseX() >= x() && input->GetMouseX() <= x() + width() &&
636+ input->GetMouseY() >= y() && input->GetMouseY() <= y() + height()) {
636637 if ( !right_click_list_.visible() &&
637638 !( right_click_list_.visible() && right_click_list_.absolute_x()<= input->GetMouseX() && input->GetMouseX() <= right_click_list_.absolute_x()+ right_click_list_.absolute_width()
638639 && right_click_list_.absolute_y() <= input->GetMouseY() && input->GetMouseY() <= right_click_list_.absolute_y() + right_click_list_.absolute_height())) {
@@ -718,6 +719,7 @@ void Input::ProcessInput(InputManager* input)
718719 SetKeyInputSelectArea(selecting_coursorpoint_.first,selecting_coursorpoint_.second,input_handle_);
719720 SetKeyInputCursorPosition(selecting_coursorpoint_.second,input_handle_);
720721 drag_flag_ = true;
722+ input->CancelMouseLeft();
721723 }
722724 // マウス左ボタンが離され、且つ前回ドラッグされていた時
723725 if (!push_mouse_left && prev_mouse_left && drag_flag_ ) {
@@ -756,6 +758,7 @@ void Input::ProcessInput(InputManager* input)
756758 }
757759 SetKeyInputCursorPosition(line_num + cnt,input_handle_);
758760 }
761+ input->CancelMouseLeft();
759762 }else{
760763 int tmp = 0,cnt = 0;
761764 for(unsigned int i = 0;i < lines_[0].size(); ++i){