godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix scrollbar icons with atlas texture. 

Draw scrollbar icons through their textures, rather than calling
directly to the server. Allows atlas textures to manipulate the source
rect as required.

(cherry picked from commit e51a94905d)
This commit is contained in:
Ibrahn Sahir 2018-07-14 14:02:08 +01:00 committed by Rémi Verschelde
parent b890ed527b
commit 33a93311ec
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/scroll_bar.cpp
View File

@ -271,9 +271,7 @@ void ScrollBar::_notification(int p_what) {
Point2 ofs; Point2 ofs;
VisualServer *vs = VisualServer::get_singleton(); decr->draw(ci, Point2());
vs->canvas_item_add_texture_rect(ci, Rect2(Point2(), decr->get_size()), decr->get_rid());
if (orientation == HORIZONTAL) if (orientation == HORIZONTAL)
ofs.x += decr->get_width(); ofs.x += decr->get_width();
@ -294,7 +292,7 @@ void ScrollBar::_notification(int p_what) {
else else
ofs.height += area.height; ofs.height += area.height;
vs->canvas_item_add_texture_rect(ci, Rect2(ofs, decr->get_size()), incr->get_rid()); incr->draw(ci, ofs);
Rect2 grabber_rect; Rect2 grabber_rect;
if (orientation == HORIZONTAL) { if (orientation == HORIZONTAL) {