You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-17 14:11:06 +00:00
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
@@ -32,51 +32,45 @@
|
||||
Size2 SpinBox::get_minimum_size() const {
|
||||
|
||||
Size2 ms = line_edit->get_combined_minimum_size();
|
||||
ms.width+=last_w;
|
||||
ms.width += last_w;
|
||||
return ms;
|
||||
}
|
||||
|
||||
|
||||
void SpinBox::_value_changed(double) {
|
||||
|
||||
String value = String::num(get_val(),Math::step_decimals(get_step()));
|
||||
if (prefix!="")
|
||||
value=prefix+" "+value;
|
||||
if (suffix!="")
|
||||
value+=" "+suffix;
|
||||
String value = String::num(get_val(), Math::step_decimals(get_step()));
|
||||
if (prefix != "")
|
||||
value = prefix + " " + value;
|
||||
if (suffix != "")
|
||||
value += " " + suffix;
|
||||
line_edit->set_text(value);
|
||||
}
|
||||
|
||||
void SpinBox::_text_entered(const String& p_string) {
|
||||
void SpinBox::_text_entered(const String &p_string) {
|
||||
|
||||
//if (!p_string.is_numeric())
|
||||
// return;
|
||||
String value = p_string;
|
||||
if (prefix!="" && p_string.begins_with(prefix))
|
||||
value = p_string.substr(prefix.length(), p_string.length()-prefix.length());
|
||||
set_val( value.to_double() );
|
||||
if (prefix != "" && p_string.begins_with(prefix))
|
||||
value = p_string.substr(prefix.length(), p_string.length() - prefix.length());
|
||||
set_val(value.to_double());
|
||||
_value_changed(0);
|
||||
}
|
||||
|
||||
|
||||
LineEdit *SpinBox::get_line_edit() {
|
||||
|
||||
return line_edit;
|
||||
}
|
||||
|
||||
|
||||
void SpinBox::_line_edit_input(const InputEvent& p_event) {
|
||||
|
||||
|
||||
|
||||
void SpinBox::_line_edit_input(const InputEvent &p_event) {
|
||||
}
|
||||
|
||||
void SpinBox::_range_click_timeout() {
|
||||
|
||||
if (!drag.enabled && Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT)) {
|
||||
|
||||
bool up = get_local_mouse_pos().y < (get_size().height/2);
|
||||
set_val( get_val() + (up?get_step():-get_step()));
|
||||
bool up = get_local_mouse_pos().y < (get_size().height / 2);
|
||||
set_val(get_val() + (up ? get_step() : -get_step()));
|
||||
|
||||
if (range_click_timer->is_one_shot()) {
|
||||
range_click_timer->set_wait_time(0.075);
|
||||
@@ -89,23 +83,21 @@ void SpinBox::_range_click_timeout() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void SpinBox::_input_event(const InputEvent& p_event) {
|
||||
void SpinBox::_input_event(const InputEvent &p_event) {
|
||||
|
||||
if (!is_editable()) {
|
||||
return;
|
||||
}
|
||||
if (p_event.type==InputEvent::MOUSE_BUTTON && p_event.mouse_button.pressed) {
|
||||
const InputEventMouseButton &mb=p_event.mouse_button;
|
||||
if (p_event.type == InputEvent::MOUSE_BUTTON && p_event.mouse_button.pressed) {
|
||||
const InputEventMouseButton &mb = p_event.mouse_button;
|
||||
|
||||
bool up = mb.y < (get_size().height / 2);
|
||||
|
||||
bool up = mb.y < (get_size().height/2);
|
||||
|
||||
switch(mb.button_index) {
|
||||
switch (mb.button_index) {
|
||||
|
||||
case BUTTON_LEFT: {
|
||||
|
||||
set_val( get_val() + (up?get_step():-get_step()));
|
||||
set_val(get_val() + (up ? get_step() : -get_step()));
|
||||
|
||||
range_click_timer->set_wait_time(0.6);
|
||||
range_click_timer->set_one_shot(true);
|
||||
@@ -115,70 +107,68 @@ void SpinBox::_input_event(const InputEvent& p_event) {
|
||||
} break;
|
||||
case BUTTON_RIGHT: {
|
||||
|
||||
set_val( (up?get_max():get_min()) );
|
||||
set_val((up ? get_max() : get_min()));
|
||||
line_edit->grab_focus();
|
||||
} break;
|
||||
case BUTTON_WHEEL_UP: {
|
||||
if (line_edit->has_focus()) {
|
||||
set_val( get_val() + get_step() );
|
||||
set_val(get_val() + get_step());
|
||||
accept_event();
|
||||
}
|
||||
} break;
|
||||
case BUTTON_WHEEL_DOWN: {
|
||||
if (line_edit->has_focus()) {
|
||||
set_val( get_val() - get_step() );
|
||||
set_val(get_val() - get_step());
|
||||
accept_event();
|
||||
}
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
if (p_event.type==InputEvent::MOUSE_BUTTON && p_event.mouse_button.pressed && p_event.mouse_button.button_index==1) {
|
||||
if (p_event.type == InputEvent::MOUSE_BUTTON && p_event.mouse_button.pressed && p_event.mouse_button.button_index == 1) {
|
||||
|
||||
//set_default_cursor_shape(CURSOR_VSIZE);
|
||||
Vector2 cpos = Vector2(p_event.mouse_button.x,p_event.mouse_button.y);
|
||||
drag.mouse_pos=cpos;
|
||||
Vector2 cpos = Vector2(p_event.mouse_button.x, p_event.mouse_button.y);
|
||||
drag.mouse_pos = cpos;
|
||||
}
|
||||
|
||||
if (p_event.type==InputEvent::MOUSE_BUTTON && !p_event.mouse_button.pressed && p_event.mouse_button.button_index==1) {
|
||||
if (p_event.type == InputEvent::MOUSE_BUTTON && !p_event.mouse_button.pressed && p_event.mouse_button.button_index == 1) {
|
||||
|
||||
//set_default_cursor_shape(CURSOR_ARROW);
|
||||
range_click_timer->stop();
|
||||
|
||||
if (drag.enabled) {
|
||||
drag.enabled=false;
|
||||
drag.enabled = false;
|
||||
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
|
||||
warp_mouse(drag.capture_pos);
|
||||
}
|
||||
}
|
||||
|
||||
if (p_event.type==InputEvent::MOUSE_MOTION && p_event.mouse_button.button_mask&1) {
|
||||
if (p_event.type == InputEvent::MOUSE_MOTION && p_event.mouse_button.button_mask & 1) {
|
||||
|
||||
Vector2 cpos = Vector2(p_event.mouse_motion.x,p_event.mouse_motion.y);
|
||||
Vector2 cpos = Vector2(p_event.mouse_motion.x, p_event.mouse_motion.y);
|
||||
if (drag.enabled) {
|
||||
|
||||
float diff_y = drag.mouse_pos.y - cpos.y;
|
||||
diff_y=Math::pow(ABS(diff_y),1.8)*SGN(diff_y);
|
||||
diff_y*=0.1;
|
||||
diff_y = Math::pow(ABS(diff_y), 1.8) * SGN(diff_y);
|
||||
diff_y *= 0.1;
|
||||
|
||||
drag.mouse_pos=cpos;
|
||||
drag.base_val=CLAMP(drag.base_val + get_step() * diff_y, get_min(), get_max());
|
||||
drag.mouse_pos = cpos;
|
||||
drag.base_val = CLAMP(drag.base_val + get_step() * diff_y, get_min(), get_max());
|
||||
|
||||
set_val( drag.base_val);
|
||||
set_val(drag.base_val);
|
||||
|
||||
} else if (drag.mouse_pos.distance_to(cpos)>2) {
|
||||
} else if (drag.mouse_pos.distance_to(cpos) > 2) {
|
||||
|
||||
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
|
||||
drag.enabled=true;
|
||||
drag.base_val=get_val();
|
||||
drag.mouse_pos=cpos;
|
||||
drag.capture_pos=cpos;
|
||||
|
||||
drag.enabled = true;
|
||||
drag.base_val = get_val();
|
||||
drag.mouse_pos = cpos;
|
||||
drag.capture_pos = cpos;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void SpinBox::_line_edit_focus_exit() {
|
||||
|
||||
_text_entered(line_edit->get_text());
|
||||
@@ -186,54 +176,48 @@ void SpinBox::_line_edit_focus_exit() {
|
||||
|
||||
void SpinBox::_notification(int p_what) {
|
||||
|
||||
if (p_what==NOTIFICATION_DRAW) {
|
||||
if (p_what == NOTIFICATION_DRAW) {
|
||||
|
||||
Ref<Texture> updown = get_icon("updown");
|
||||
|
||||
int w = updown->get_width();
|
||||
if (w!=last_w) {
|
||||
line_edit->set_margin(MARGIN_RIGHT,w);
|
||||
last_w=w;
|
||||
if (w != last_w) {
|
||||
line_edit->set_margin(MARGIN_RIGHT, w);
|
||||
last_w = w;
|
||||
}
|
||||
|
||||
RID ci = get_canvas_item();
|
||||
Size2i size = get_size();
|
||||
|
||||
updown->draw(ci,Point2i(size.width-updown->get_width(),(size.height-updown->get_height())/2));
|
||||
|
||||
} else if (p_what==NOTIFICATION_FOCUS_EXIT) {
|
||||
updown->draw(ci, Point2i(size.width - updown->get_width(), (size.height - updown->get_height()) / 2));
|
||||
|
||||
} else if (p_what == NOTIFICATION_FOCUS_EXIT) {
|
||||
|
||||
//_value_changed(0);
|
||||
} else if (p_what==NOTIFICATION_ENTER_TREE) {
|
||||
} else if (p_what == NOTIFICATION_ENTER_TREE) {
|
||||
|
||||
_value_changed(0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void SpinBox::set_suffix(const String &p_suffix) {
|
||||
|
||||
void SpinBox::set_suffix(const String& p_suffix) {
|
||||
|
||||
suffix=p_suffix;
|
||||
suffix = p_suffix;
|
||||
_value_changed(0);
|
||||
|
||||
}
|
||||
|
||||
String SpinBox::get_suffix() const{
|
||||
String SpinBox::get_suffix() const {
|
||||
|
||||
return suffix;
|
||||
}
|
||||
|
||||
void SpinBox::set_prefix(const String &p_prefix) {
|
||||
|
||||
void SpinBox::set_prefix(const String& p_prefix) {
|
||||
|
||||
prefix=p_prefix;
|
||||
prefix = p_prefix;
|
||||
_value_changed(0);
|
||||
|
||||
}
|
||||
|
||||
String SpinBox::get_prefix() const{
|
||||
String SpinBox::get_prefix() const {
|
||||
|
||||
return prefix;
|
||||
}
|
||||
@@ -250,41 +234,38 @@ bool SpinBox::is_editable() const {
|
||||
void SpinBox::_bind_methods() {
|
||||
|
||||
//ObjectTypeDB::bind_method(_MD("_value_changed"),&SpinBox::_value_changed);
|
||||
ObjectTypeDB::bind_method(_MD("_input_event"),&SpinBox::_input_event);
|
||||
ObjectTypeDB::bind_method(_MD("_text_entered"),&SpinBox::_text_entered);
|
||||
ObjectTypeDB::bind_method(_MD("set_suffix","suffix"),&SpinBox::set_suffix);
|
||||
ObjectTypeDB::bind_method(_MD("get_suffix"),&SpinBox::get_suffix);
|
||||
ObjectTypeDB::bind_method(_MD("set_prefix","prefix"),&SpinBox::set_prefix);
|
||||
ObjectTypeDB::bind_method(_MD("get_prefix"),&SpinBox::get_prefix);
|
||||
ObjectTypeDB::bind_method(_MD("set_editable","editable"),&SpinBox::set_editable);
|
||||
ObjectTypeDB::bind_method(_MD("is_editable"),&SpinBox::is_editable);
|
||||
ObjectTypeDB::bind_method(_MD("_line_edit_focus_exit"),&SpinBox::_line_edit_focus_exit);
|
||||
ObjectTypeDB::bind_method(_MD("get_line_edit"),&SpinBox::get_line_edit);
|
||||
ObjectTypeDB::bind_method(_MD("_line_edit_input"),&SpinBox::_line_edit_input);
|
||||
ObjectTypeDB::bind_method(_MD("_range_click_timeout"),&SpinBox::_range_click_timeout);
|
||||
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL,"editable"),_SCS("set_editable"),_SCS("is_editable"));
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING,"prefix"),_SCS("set_prefix"),_SCS("get_prefix"));
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING,"suffix"),_SCS("set_suffix"),_SCS("get_suffix"));
|
||||
|
||||
ObjectTypeDB::bind_method(_MD("_input_event"), &SpinBox::_input_event);
|
||||
ObjectTypeDB::bind_method(_MD("_text_entered"), &SpinBox::_text_entered);
|
||||
ObjectTypeDB::bind_method(_MD("set_suffix", "suffix"), &SpinBox::set_suffix);
|
||||
ObjectTypeDB::bind_method(_MD("get_suffix"), &SpinBox::get_suffix);
|
||||
ObjectTypeDB::bind_method(_MD("set_prefix", "prefix"), &SpinBox::set_prefix);
|
||||
ObjectTypeDB::bind_method(_MD("get_prefix"), &SpinBox::get_prefix);
|
||||
ObjectTypeDB::bind_method(_MD("set_editable", "editable"), &SpinBox::set_editable);
|
||||
ObjectTypeDB::bind_method(_MD("is_editable"), &SpinBox::is_editable);
|
||||
ObjectTypeDB::bind_method(_MD("_line_edit_focus_exit"), &SpinBox::_line_edit_focus_exit);
|
||||
ObjectTypeDB::bind_method(_MD("get_line_edit"), &SpinBox::get_line_edit);
|
||||
ObjectTypeDB::bind_method(_MD("_line_edit_input"), &SpinBox::_line_edit_input);
|
||||
ObjectTypeDB::bind_method(_MD("_range_click_timeout"), &SpinBox::_range_click_timeout);
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editable"), _SCS("set_editable"), _SCS("is_editable"));
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING, "prefix"), _SCS("set_prefix"), _SCS("get_prefix"));
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING, "suffix"), _SCS("set_suffix"), _SCS("get_suffix"));
|
||||
}
|
||||
|
||||
SpinBox::SpinBox() {
|
||||
|
||||
last_w = 0;
|
||||
line_edit = memnew( LineEdit );
|
||||
line_edit = memnew(LineEdit);
|
||||
add_child(line_edit);
|
||||
|
||||
line_edit->set_area_as_parent_rect();
|
||||
//connect("value_changed",this,"_value_changed");
|
||||
line_edit->connect("text_entered",this,"_text_entered",Vector<Variant>(),CONNECT_DEFERRED);
|
||||
line_edit->connect("focus_exit",this,"_line_edit_focus_exit",Vector<Variant>(),CONNECT_DEFERRED);
|
||||
line_edit->connect("input_event",this,"_line_edit_input");
|
||||
drag.enabled=false;
|
||||
line_edit->connect("text_entered", this, "_text_entered", Vector<Variant>(), CONNECT_DEFERRED);
|
||||
line_edit->connect("focus_exit", this, "_line_edit_focus_exit", Vector<Variant>(), CONNECT_DEFERRED);
|
||||
line_edit->connect("input_event", this, "_line_edit_input");
|
||||
drag.enabled = false;
|
||||
|
||||
range_click_timer = memnew( Timer );
|
||||
range_click_timer->connect("timeout",this,"_range_click_timeout");
|
||||
range_click_timer = memnew(Timer);
|
||||
range_click_timer->connect("timeout", this, "_range_click_timeout");
|
||||
add_child(range_click_timer);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user