godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

General docks clean up

Browse Source 
-Moved path box above in fs dock
-Remove up/down button and added reordering with DND of favorites
-Changed zoom icon to be centered vertically
-Made filter for files always visible
-Added some options to TextureFrame for better alignment/stretching
This commit is contained in:
Juan Linietsky
2016-05-23 23:24:17 -03:00
parent 472ab44768
commit e843e74d39
5 changed files with 183 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scene/gui/texture_frame.cpp
View File

@@ -37,9 +37,31 @@ void TextureFrame::_notification(int p_what) {
return;
Size2 s=expand?get_size():texture->get_size();
RID ci = get_canvas_item();
draw_texture_rect(texture,Rect2(Point2(),s),false,modulate);
switch(stretch_mode) {
case STRETCH_SCALE_ON_EXPAND: {
Size2 s=expand?get_size():texture->get_size();
draw_texture_rect(texture,Rect2(Point2(),s),false,modulate);
} break;
case STRETCH_SCALE: {
draw_texture_rect(texture,Rect2(Point2(),get_size()),false,modulate);
} break;
case STRETCH_TILE: {
draw_texture_rect(texture,Rect2(Point2(),get_size()),true,modulate);
} break;
case STRETCH_KEEP: {
draw_texture_rect(texture,Rect2(Point2(),texture->get_size()),false,modulate);
} break;
case STRETCH_KEEP_CENTERED: {
Vector2 ofs = (get_size() - texture->get_size())/2;
draw_texture_rect(texture,Rect2(ofs,texture->get_size()),false,modulate);
} break;
}
/*
Vector<Point2> points;
@@ -76,11 +98,19 @@ void TextureFrame::_bind_methods() {
ObjectTypeDB::bind_method(_MD("get_modulate"), & TextureFrame::get_modulate );
ObjectTypeDB::bind_method(_MD("set_expand","enable"), & TextureFrame::set_expand );
ObjectTypeDB::bind_method(_MD("has_expand"), & TextureFrame::has_expand );
ObjectTypeDB::bind_method(_MD("set_stretch_mode","stretch_mode"), & TextureFrame::set_stretch_mode );
ObjectTypeDB::bind_method(_MD("get_stretch_mode"), & TextureFrame::get_stretch_mode );
ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), _SCS("set_texture"),_SCS("get_texture") );
ADD_PROPERTYNO( PropertyInfo( Variant::COLOR, "modulate"), _SCS("set_modulate"),_SCS("get_modulate") );
ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "expand" ), _SCS("set_expand"),_SCS("has_expand") );
ADD_PROPERTYNO( PropertyInfo( Variant::INT, "stretch_mode",PROPERTY_HINT_ENUM,"Scale On Expand (Compat),Scale,Tile,Keep,Keep Centered"), _SCS("set_stretch_mode"),_SCS("get_stretch_mode") );
BIND_CONSTANT( STRETCH_SCALE_ON_EXPAND );
BIND_CONSTANT( STRETCH_SCALE );
BIND_CONSTANT( STRETCH_TILE );
BIND_CONSTANT( STRETCH_KEEP );
BIND_CONSTANT( STRETCH_KEEP_CENTERED );
}
@@ -121,12 +151,24 @@ bool TextureFrame::has_expand() const {
return expand;
}
void TextureFrame::set_stretch_mode(StretchMode p_mode) {
stretch_mode=p_mode;
update();
}
TextureFrame::StretchMode TextureFrame::get_stretch_mode() const {
return stretch_mode;
}
TextureFrame::TextureFrame() {
expand=false;
modulate=Color(1,1,1,1);
set_ignore_mouse(true);
stretch_mode=STRETCH_SCALE_ON_EXPAND;
}