diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
| commit | eacb8f04c4697b8123afeec03088eebb3c4b20bd (patch) | |
| tree | 8070f7807ec5d6a375df7184b151abbee8790608 /scene/main | |
| parent | a75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff) | |
| parent | 4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/http_request.cpp | 2 | ||||
| -rw-r--r-- | scene/main/viewport.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp index 90e3713799..328ad8fb26 100644 --- a/scene/main/http_request.cpp +++ b/scene/main/http_request.cpp @@ -494,7 +494,7 @@ HTTPRequest::HTTPRequest() max_redirects=8; body_len=-1; got_response=false; - validate_ssl=false; + validate_ssl=false; use_ssl=false; response_code=0; request_sent=false; diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index c9f61beba7..5ce53194a1 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1842,6 +1842,8 @@ void Viewport::_gui_input_event(InputEvent p_event) { if (gui.mouse_over) gui.mouse_over->notification(Control::NOTIFICATION_MOUSE_EXIT); + _gui_cancel_tooltip(); + if (over) over->notification(Control::NOTIFICATION_MOUSE_ENTER); @@ -1849,8 +1851,6 @@ void Viewport::_gui_input_event(InputEvent p_event) { gui.mouse_over=over; - _gui_cancel_tooltip(); - if (gui.drag_preview) { gui.drag_preview->set_pos(mpos); } @@ -2407,7 +2407,7 @@ String Viewport::get_configuration_warning() const { if (get_parent() && !get_parent()->cast_to<Control>() && !render_target) { - return TTR("This viewport is not set as render target. If you intend for it to display it's contents directly to the screen, make it a child of a Control so it can obtain a size. Otherwise, make it a RenderTarget and assign it's internal texture to some node for display."); + return TTR("This viewport is not set as render target. If you intend for it to display its contents directly to the screen, make it a child of a Control so it can obtain a size. Otherwise, make it a RenderTarget and assign its internal texture to some node for display."); } return String(); |