diff options
| author | geequlim | 2017-02-07 22:34:55 +0800 |
|---|---|---|
| committer | geequlim | 2017-02-13 20:04:21 +0800 |
| commit | a7ec7dcd1228137535601eefadd56a05c966ff5a (patch) | |
| tree | fae2190810b9e50a5774a6618322598ab8d66757 /scene/gui/texture_frame.cpp | |
| parent | 58a700e43e69ee025e046caa9677fdf755df17b8 (diff) | |
| download | godot-a7ec7dcd1228137535601eefadd56a05c966ff5a.tar.gz godot-a7ec7dcd1228137535601eefadd56a05c966ff5a.tar.zst godot-a7ec7dcd1228137535601eefadd56a05c966ff5a.zip | |
Add scale property back for backwards compatibility
now we have a choice
Fix textureframe modulate doesn't work with STRETCH_KEEP_ASPECT_CENTERED and STRETCH_KEEP_ASPECT
Diffstat (limited to '')
| -rw-r--r-- | scene/gui/texture_frame.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scene/gui/texture_frame.cpp b/scene/gui/texture_frame.cpp index bc30737cb..278fff996 100644 --- a/scene/gui/texture_frame.cpp +++ b/scene/gui/texture_frame.cpp @@ -77,7 +77,7 @@ void TextureFrame::_notification(int p_what) { ofs_y+=(size.height - tex_height)/2; } - draw_texture_rect(texture,Rect2(ofs_x,ofs_y,tex_width,tex_height)); + draw_texture_rect(texture,Rect2(ofs_x,ofs_y,tex_width,tex_height),false,modulate); } break; case STRETCH_KEEP_ASPECT_COVERED: { @@ -191,5 +191,3 @@ TextureFrame::TextureFrame() { TextureFrame::~TextureFrame() { } - - |