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

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
scene/gui/slider.cpp
View File

@@ -29,91 +29,88 @@
#include "slider.h"
#include "os/keyboard.h"
Size2 Slider::get_minimum_size() const {
Ref<StyleBox> style = get_stylebox("slider");
Size2i ms = style->get_minimum_size()+style->get_center_size();
Size2i ms = style->get_minimum_size() + style->get_center_size();
return ms;
}
void Slider::_input_event(InputEvent p_event) {
if (p_event.type==InputEvent::MOUSE_BUTTON) {
if (p_event.type == InputEvent::MOUSE_BUTTON) {
InputEventMouseButton &mb = p_event.mouse_button;
if (mb.button_index==BUTTON_LEFT) {
if (mb.button_index == BUTTON_LEFT) {
if (mb.pressed) {
Ref<Texture> grabber = get_icon(mouse_inside||has_focus()?"grabber_hilite":"grabber");
grab.pos=orientation==VERTICAL?mb.y:mb.x;
if (mb.pressed) {
Ref<Texture> grabber = get_icon(mouse_inside || has_focus() ? "grabber_hilite" : "grabber");
grab.pos = orientation == VERTICAL ? mb.y : mb.x;
double grab_width = (double)grabber->get_size().width;
double grab_height = (double)grabber->get_size().height;
double max = orientation==VERTICAL ? get_size().height - grab_height : get_size().width - grab_width;
if (orientation==VERTICAL)
set_unit_value( 1 - (((double)grab.pos - (grab_height / 2.0)) / max) );
double max = orientation == VERTICAL ? get_size().height - grab_height : get_size().width - grab_width;
if (orientation == VERTICAL)
set_unit_value(1 - (((double)grab.pos - (grab_height / 2.0)) / max));
else
set_unit_value(((double)grab.pos - (grab_width/2.0)) / max);
grab.active=true;
grab.uvalue=get_unit_value();
set_unit_value(((double)grab.pos - (grab_width / 2.0)) / max);
grab.active = true;
grab.uvalue = get_unit_value();
} else {
grab.active=false;
grab.active = false;
}
} else if (mb.pressed && mb.button_index==BUTTON_WHEEL_UP) {
} else if (mb.pressed && mb.button_index == BUTTON_WHEEL_UP) {
set_val( get_val() + get_step());
} else if (mb.pressed && mb.button_index==BUTTON_WHEEL_DOWN) {
set_val( get_val() - get_step());
set_val(get_val() + get_step());
} else if (mb.pressed && mb.button_index == BUTTON_WHEEL_DOWN) {
set_val(get_val() - get_step());
}
} else if (p_event.type==InputEvent::MOUSE_MOTION) {
} else if (p_event.type == InputEvent::MOUSE_MOTION) {
if (grab.active) {
Size2i size = get_size();
Ref<Texture> grabber = get_icon("grabber");
float motion = (orientation==VERTICAL?p_event.mouse_motion.y:p_event.mouse_motion.x) - grab.pos;
if (orientation==VERTICAL)
motion=-motion;
float areasize = orientation==VERTICAL?size.height - grabber->get_size().height:size.width - grabber->get_size().width;
if (areasize<=0)
float motion = (orientation == VERTICAL ? p_event.mouse_motion.y : p_event.mouse_motion.x) - grab.pos;
if (orientation == VERTICAL)
motion = -motion;
float areasize = orientation == VERTICAL ? size.height - grabber->get_size().height : size.width - grabber->get_size().width;
if (areasize <= 0)
return;
float umotion = motion / float(areasize);
set_unit_value( grab.uvalue + umotion );
set_unit_value(grab.uvalue + umotion);
}
} else {
if (p_event.is_action("ui_left") && p_event.is_pressed()) {
if (orientation!=HORIZONTAL)
if (orientation != HORIZONTAL)
return;
set_val( get_val() - (custom_step>=0?custom_step:get_step()) );
set_val(get_val() - (custom_step >= 0 ? custom_step : get_step()));
accept_event();
} else if (p_event.is_action("ui_right") && p_event.is_pressed()) {
if (orientation!=HORIZONTAL)
if (orientation != HORIZONTAL)
return;
set_val( get_val() + (custom_step>=0?custom_step:get_step()) );
set_val(get_val() + (custom_step >= 0 ? custom_step : get_step()));
accept_event();
} else if (p_event.is_action("ui_up") && p_event.is_pressed()) {
if (orientation!=VERTICAL)
if (orientation != VERTICAL)
return;
set_val( get_val() + (custom_step>=0?custom_step:get_step()) );
set_val(get_val() + (custom_step >= 0 ? custom_step : get_step()));
accept_event();
} else if (p_event.is_action("ui_down") && p_event.is_pressed()) {
if (orientation!=VERTICAL)
if (orientation != VERTICAL)
return;
set_val( get_val() - (custom_step>=0?custom_step:get_step()) );
set_val(get_val() - (custom_step >= 0 ? custom_step : get_step()));
accept_event();
} else if (p_event.type==InputEvent::KEY) {
} else if (p_event.type == InputEvent::KEY) {
const InputEventKey &k=p_event.key;
const InputEventKey &k = p_event.key;
if (!k.pressed)
return;
@@ -122,35 +119,32 @@ void Slider::_input_event(InputEvent p_event) {
case KEY_HOME: {
set_val( get_min() );
set_val(get_min());
accept_event();
} break;
case KEY_END: {
set_val( get_max() );
set_val(get_max());
accept_event();
} break;
} ;
};
}
}
}
void Slider::_notification(int p_what) {
switch(p_what) {
switch (p_what) {
case NOTIFICATION_MOUSE_ENTER: {
mouse_inside=true;
mouse_inside = true;
update();
} break;
case NOTIFICATION_MOUSE_EXIT: {
mouse_inside=false;
mouse_inside = false;
update();
} break;
case NOTIFICATION_DRAW: {
@@ -158,41 +152,39 @@ void Slider::_notification(int p_what) {
Size2i size = get_size();
Ref<StyleBox> style = get_stylebox("slider");
Ref<StyleBox> focus = get_stylebox("focus");
Ref<Texture> grabber = get_icon(mouse_inside||has_focus()?"grabber_hilite":"grabber");
Ref<Texture> grabber = get_icon(mouse_inside || has_focus() ? "grabber_hilite" : "grabber");
Ref<Texture> tick = get_icon("tick");
if (orientation==VERTICAL) {
if (orientation == VERTICAL) {
style->draw(ci,Rect2i(Point2i(),Size2i(style->get_minimum_size().width+style->get_center_size().width,size.height)));
style->draw(ci, Rect2i(Point2i(), Size2i(style->get_minimum_size().width + style->get_center_size().width, size.height)));
//if (mouse_inside||has_focus())
// focus->draw(ci,Rect2i(Point2i(),Size2i(style->get_minimum_size().width+style->get_center_size().width,size.height)));
float areasize = size.height - grabber->get_size().height;
if (ticks>1) {
if (ticks > 1) {
int tickarea = size.height - tick->get_height();
for(int i=0;i<ticks;i++) {
if( ! ticks_on_borders && (i == 0 || i + 1 == ticks) ) continue;
int ofs = i*tickarea/(ticks-1);
tick->draw(ci,Point2(0,ofs));
for (int i = 0; i < ticks; i++) {
if (!ticks_on_borders && (i == 0 || i + 1 == ticks)) continue;
int ofs = i * tickarea / (ticks - 1);
tick->draw(ci, Point2(0, ofs));
}
}
grabber->draw(ci,Point2i(size.width/2-grabber->get_size().width/2,size.height - get_unit_value()*areasize - grabber->get_size().height));
grabber->draw(ci, Point2i(size.width / 2 - grabber->get_size().width / 2, size.height - get_unit_value() * areasize - grabber->get_size().height));
} else {
style->draw(ci,Rect2i(Point2i(),Size2i(size.width,style->get_minimum_size().height+style->get_center_size().height)));
style->draw(ci, Rect2i(Point2i(), Size2i(size.width, style->get_minimum_size().height + style->get_center_size().height)));
//if (mouse_inside||has_focus())
// focus->draw(ci,Rect2i(Point2i(),Size2i(size.width,style->get_minimum_size().height+style->get_center_size().height)));
float areasize = size.width - grabber->get_size().width;
if (ticks>1) {
if (ticks > 1) {
int tickarea = size.width - tick->get_width();
for(int i=0;i<ticks;i++) {
if( (! ticks_on_borders) && ( (i == 0) || ((i + 1) == ticks)) ) continue;
int ofs = i*tickarea/(ticks-1);
tick->draw(ci,Point2(ofs,0));
for (int i = 0; i < ticks; i++) {
if ((!ticks_on_borders) && ((i == 0) || ((i + 1) == ticks))) continue;
int ofs = i * tickarea / (ticks - 1);
tick->draw(ci, Point2(ofs, 0));
}
}
grabber->draw(ci,Point2i(get_unit_value()*areasize,size.height/2-grabber->get_size().height/2));
grabber->draw(ci, Point2i(get_unit_value() * areasize, size.height / 2 - grabber->get_size().height / 2));
}
} break;
@@ -201,7 +193,7 @@ void Slider::_notification(int p_what) {
void Slider::set_custom_step(float p_custom_step) {
custom_step=p_custom_step;
custom_step = p_custom_step;
}
float Slider::get_custom_step() const {
@@ -211,7 +203,7 @@ float Slider::get_custom_step() const {
void Slider::set_ticks(int p_count) {
ticks=p_count;
ticks = p_count;
update();
}
@@ -220,35 +212,34 @@ int Slider::get_ticks() const {
return ticks;
}
bool Slider::get_ticks_on_borders() const{
bool Slider::get_ticks_on_borders() const {
return ticks_on_borders;
}
void Slider::set_ticks_on_borders(bool _tob){
void Slider::set_ticks_on_borders(bool _tob) {
ticks_on_borders = _tob;
update();
}
void Slider::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_input_event"),&Slider::_input_event);
ObjectTypeDB::bind_method(_MD("set_ticks","count"),&Slider::set_ticks);
ObjectTypeDB::bind_method(_MD("get_ticks"),&Slider::get_ticks);
ObjectTypeDB::bind_method(_MD("_input_event"), &Slider::_input_event);
ObjectTypeDB::bind_method(_MD("set_ticks", "count"), &Slider::set_ticks);
ObjectTypeDB::bind_method(_MD("get_ticks"), &Slider::get_ticks);
ObjectTypeDB::bind_method(_MD("get_ticks_on_borders"),&Slider::get_ticks_on_borders);
ObjectTypeDB::bind_method(_MD("set_ticks_on_borders","ticks_on_border"),&Slider::set_ticks_on_borders);
ADD_PROPERTY( PropertyInfo( Variant::INT, "tick_count", PROPERTY_HINT_RANGE,"0,4096,1"), _SCS("set_ticks"), _SCS("get_ticks") );
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "ticks_on_borders" ), _SCS("set_ticks_on_borders"), _SCS("get_ticks_on_borders") );
ADD_PROPERTY( PropertyInfo( Variant::INT,"focus_mode", PROPERTY_HINT_ENUM, "None,Click,All" ), _SCS("set_focus_mode"), _SCS("get_focus_mode") );
ObjectTypeDB::bind_method(_MD("get_ticks_on_borders"), &Slider::get_ticks_on_borders);
ObjectTypeDB::bind_method(_MD("set_ticks_on_borders", "ticks_on_border"), &Slider::set_ticks_on_borders);
ADD_PROPERTY(PropertyInfo(Variant::INT, "tick_count", PROPERTY_HINT_RANGE, "0,4096,1"), _SCS("set_ticks"), _SCS("get_ticks"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "ticks_on_borders"), _SCS("set_ticks_on_borders"), _SCS("get_ticks_on_borders"));
ADD_PROPERTY(PropertyInfo(Variant::INT, "focus_mode", PROPERTY_HINT_ENUM, "None,Click,All"), _SCS("set_focus_mode"), _SCS("get_focus_mode"));
}
Slider::Slider(Orientation p_orientation) {
orientation=p_orientation;
mouse_inside=false;
grab.active=false;
ticks=0;
custom_step=-1;
orientation = p_orientation;
mouse_inside = false;
grab.active = false;
ticks = 0;
custom_step = -1;
set_focus_mode(FOCUS_ALL);
}