You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-18 14:21:41 +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
@@ -28,162 +28,149 @@
|
||||
/*************************************************************************/
|
||||
#include "scroll_bar.h"
|
||||
#include "os/keyboard.h"
|
||||
#include "print_string.h"
|
||||
#include "os/os.h"
|
||||
bool ScrollBar::focus_by_default=false;
|
||||
|
||||
|
||||
#include "print_string.h"
|
||||
bool ScrollBar::focus_by_default = false;
|
||||
|
||||
void ScrollBar::set_can_focus_by_default(bool p_can_focus) {
|
||||
|
||||
focus_by_default=p_can_focus;
|
||||
focus_by_default = p_can_focus;
|
||||
}
|
||||
|
||||
void ScrollBar::_input_event(InputEvent p_event) {
|
||||
|
||||
|
||||
switch(p_event.type) {
|
||||
switch (p_event.type) {
|
||||
|
||||
case InputEvent::MOUSE_BUTTON: {
|
||||
|
||||
const InputEventMouseButton &b=p_event.mouse_button;
|
||||
const InputEventMouseButton &b = p_event.mouse_button;
|
||||
accept_event();
|
||||
|
||||
if (b.button_index==5 && b.pressed) {
|
||||
if (b.button_index == 5 && b.pressed) {
|
||||
|
||||
//if (orientation==VERTICAL)
|
||||
// set_val( get_val() + get_page() / 4.0 );
|
||||
//else
|
||||
set_val( get_val() + get_page() / 4.0 );
|
||||
set_val(get_val() + get_page() / 4.0);
|
||||
accept_event();
|
||||
|
||||
}
|
||||
|
||||
if (b.button_index==4 && b.pressed) {
|
||||
if (b.button_index == 4 && b.pressed) {
|
||||
|
||||
//if (orientation==HORIZONTAL)
|
||||
// set_val( get_val() - get_page() / 4.0 );
|
||||
//else
|
||||
set_val( get_val() - get_page() / 4.0 );
|
||||
set_val(get_val() - get_page() / 4.0);
|
||||
accept_event();
|
||||
}
|
||||
|
||||
if (b.button_index!=1)
|
||||
if (b.button_index != 1)
|
||||
return;
|
||||
|
||||
|
||||
if (b.pressed) {
|
||||
|
||||
|
||||
double ofs = orientation==VERTICAL ? b.y : b.x ;
|
||||
double ofs = orientation == VERTICAL ? b.y : b.x;
|
||||
Ref<Texture> decr = get_icon("decrement");
|
||||
Ref<Texture> incr = get_icon("increment");
|
||||
|
||||
double decr_size = orientation==VERTICAL ? decr->get_height() : decr->get_width();
|
||||
double incr_size = orientation==VERTICAL ? incr->get_height() : incr->get_width();
|
||||
double decr_size = orientation == VERTICAL ? decr->get_height() : decr->get_width();
|
||||
double incr_size = orientation == VERTICAL ? incr->get_height() : incr->get_width();
|
||||
double grabber_ofs = get_grabber_offset();
|
||||
double grabber_size = get_grabber_size();
|
||||
double total = orientation==VERTICAL ? get_size().height : get_size().width;
|
||||
double total = orientation == VERTICAL ? get_size().height : get_size().width;
|
||||
|
||||
if (ofs < decr_size ) {
|
||||
if (ofs < decr_size) {
|
||||
|
||||
set_val( get_val() - (custom_step>=0?custom_step:get_step()) );
|
||||
set_val(get_val() - (custom_step >= 0 ? custom_step : get_step()));
|
||||
break;
|
||||
}
|
||||
|
||||
if (ofs > total-incr_size ) {
|
||||
if (ofs > total - incr_size) {
|
||||
|
||||
set_val( get_val() + (custom_step>=0?custom_step:get_step()) );
|
||||
set_val(get_val() + (custom_step >= 0 ? custom_step : get_step()));
|
||||
break;
|
||||
}
|
||||
|
||||
ofs-=decr_size;
|
||||
ofs -= decr_size;
|
||||
|
||||
if ( ofs < grabber_ofs ) {
|
||||
if (ofs < grabber_ofs) {
|
||||
|
||||
set_val( get_val() - get_page() );
|
||||
set_val(get_val() - get_page());
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
ofs-=grabber_ofs;
|
||||
ofs -= grabber_ofs;
|
||||
|
||||
if (ofs < grabber_size ) {
|
||||
if (ofs < grabber_size) {
|
||||
|
||||
drag.active=true;
|
||||
drag.pos_at_click=grabber_ofs+ofs;
|
||||
drag.value_at_click=get_unit_value();
|
||||
drag.active = true;
|
||||
drag.pos_at_click = grabber_ofs + ofs;
|
||||
drag.value_at_click = get_unit_value();
|
||||
update();
|
||||
} else {
|
||||
|
||||
|
||||
set_val( get_val() + get_page() );
|
||||
set_val(get_val() + get_page());
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
|
||||
drag.active=false;
|
||||
drag.active = false;
|
||||
update();
|
||||
}
|
||||
|
||||
} break;
|
||||
case InputEvent::MOUSE_MOTION: {
|
||||
|
||||
const InputEventMouseMotion &m=p_event.mouse_motion;
|
||||
const InputEventMouseMotion &m = p_event.mouse_motion;
|
||||
|
||||
accept_event();
|
||||
|
||||
|
||||
if (drag.active) {
|
||||
|
||||
double ofs = orientation==VERTICAL ? m.y : m.x ;
|
||||
double ofs = orientation == VERTICAL ? m.y : m.x;
|
||||
Ref<Texture> decr = get_icon("decrement");
|
||||
|
||||
double decr_size = orientation==VERTICAL ? decr->get_height() : decr->get_width();
|
||||
ofs-=decr_size;
|
||||
double decr_size = orientation == VERTICAL ? decr->get_height() : decr->get_width();
|
||||
ofs -= decr_size;
|
||||
|
||||
double diff = (ofs-drag.pos_at_click) / get_area_size();
|
||||
double diff = (ofs - drag.pos_at_click) / get_area_size();
|
||||
|
||||
set_unit_value( drag.value_at_click + diff );
|
||||
set_unit_value(drag.value_at_click + diff);
|
||||
} else {
|
||||
|
||||
|
||||
double ofs = orientation==VERTICAL ? m.y : m.x ;
|
||||
double ofs = orientation == VERTICAL ? m.y : m.x;
|
||||
Ref<Texture> decr = get_icon("decrement");
|
||||
Ref<Texture> incr = get_icon("increment");
|
||||
|
||||
double decr_size = orientation==VERTICAL ? decr->get_height() : decr->get_width();
|
||||
double incr_size = orientation==VERTICAL ? incr->get_height() : incr->get_width();
|
||||
double total = orientation==VERTICAL ? get_size().height : get_size().width;
|
||||
double decr_size = orientation == VERTICAL ? decr->get_height() : decr->get_width();
|
||||
double incr_size = orientation == VERTICAL ? incr->get_height() : incr->get_width();
|
||||
double total = orientation == VERTICAL ? get_size().height : get_size().width;
|
||||
|
||||
HiliteStatus new_hilite;
|
||||
|
||||
if (ofs < decr_size ) {
|
||||
if (ofs < decr_size) {
|
||||
|
||||
new_hilite=HILITE_DECR;
|
||||
new_hilite = HILITE_DECR;
|
||||
|
||||
} else if (ofs > total-incr_size ) {
|
||||
} else if (ofs > total - incr_size) {
|
||||
|
||||
new_hilite=HILITE_INCR;
|
||||
new_hilite = HILITE_INCR;
|
||||
|
||||
} else {
|
||||
|
||||
new_hilite=HILITE_RANGE;
|
||||
new_hilite = HILITE_RANGE;
|
||||
}
|
||||
|
||||
if (new_hilite!=hilite) {
|
||||
if (new_hilite != hilite) {
|
||||
|
||||
hilite=new_hilite;
|
||||
hilite = new_hilite;
|
||||
update();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
} break;
|
||||
case InputEvent::KEY: {
|
||||
|
||||
const InputEventKey &k=p_event.key;
|
||||
const InputEventKey &k = p_event.key;
|
||||
|
||||
if (!k.pressed)
|
||||
return;
|
||||
@@ -192,317 +179,296 @@ void ScrollBar::_input_event(InputEvent p_event) {
|
||||
|
||||
case KEY_LEFT: {
|
||||
|
||||
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()));
|
||||
|
||||
} break;
|
||||
case KEY_RIGHT: {
|
||||
|
||||
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()));
|
||||
|
||||
} break;
|
||||
case KEY_UP: {
|
||||
|
||||
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()));
|
||||
|
||||
} break;
|
||||
case KEY_DOWN: {
|
||||
|
||||
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()));
|
||||
|
||||
} break;
|
||||
case KEY_HOME: {
|
||||
|
||||
set_val( get_min() );
|
||||
set_val(get_min());
|
||||
|
||||
} break;
|
||||
case KEY_END: {
|
||||
|
||||
set_val( get_max() );
|
||||
set_val(get_max());
|
||||
|
||||
} break;
|
||||
|
||||
} break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ScrollBar::_notification(int p_what) {
|
||||
|
||||
if (p_what==NOTIFICATION_DRAW) {
|
||||
if (p_what == NOTIFICATION_DRAW) {
|
||||
|
||||
RID ci = get_canvas_item();
|
||||
|
||||
Ref<Texture> decr = hilite==HILITE_DECR ? get_icon("decrement_hilite") : get_icon("decrement");
|
||||
Ref<Texture> incr = hilite==HILITE_INCR ? get_icon("increment_hilite") : get_icon("increment");
|
||||
Ref<Texture> decr = hilite == HILITE_DECR ? get_icon("decrement_hilite") : get_icon("decrement");
|
||||
Ref<Texture> incr = hilite == HILITE_INCR ? get_icon("increment_hilite") : get_icon("increment");
|
||||
Ref<StyleBox> bg = has_focus() ? get_stylebox("scroll_focus") : get_stylebox("scroll");
|
||||
Ref<StyleBox> grabber = (drag.active || hilite==HILITE_RANGE) ? get_stylebox("grabber_hilite") : get_stylebox("grabber");
|
||||
Ref<StyleBox> grabber = (drag.active || hilite == HILITE_RANGE) ? get_stylebox("grabber_hilite") : get_stylebox("grabber");
|
||||
|
||||
Point2 ofs;
|
||||
|
||||
VisualServer *vs = VisualServer::get_singleton();
|
||||
|
||||
vs->canvas_item_add_texture_rect( ci, Rect2( Point2(), decr->get_size()),decr->get_rid() );
|
||||
vs->canvas_item_add_texture_rect(ci, Rect2(Point2(), decr->get_size()), decr->get_rid());
|
||||
|
||||
if (orientation==HORIZONTAL)
|
||||
ofs.x+=decr->get_width();
|
||||
if (orientation == HORIZONTAL)
|
||||
ofs.x += decr->get_width();
|
||||
else
|
||||
ofs.y+=decr->get_height();
|
||||
ofs.y += decr->get_height();
|
||||
|
||||
Size2 area=get_size();
|
||||
Size2 area = get_size();
|
||||
|
||||
if (orientation==HORIZONTAL)
|
||||
area.width-=incr->get_width()+decr->get_width();
|
||||
if (orientation == HORIZONTAL)
|
||||
area.width -= incr->get_width() + decr->get_width();
|
||||
else
|
||||
area.height-=incr->get_height()+decr->get_height();
|
||||
area.height -= incr->get_height() + decr->get_height();
|
||||
|
||||
bg->draw(ci,Rect2(ofs,area));
|
||||
bg->draw(ci, Rect2(ofs, area));
|
||||
|
||||
if (orientation==HORIZONTAL)
|
||||
ofs.width+=area.width;
|
||||
if (orientation == HORIZONTAL)
|
||||
ofs.width += area.width;
|
||||
else
|
||||
ofs.height+=area.height;
|
||||
ofs.height += area.height;
|
||||
|
||||
vs->canvas_item_add_texture_rect( ci, Rect2( ofs, decr->get_size()),incr->get_rid() );
|
||||
vs->canvas_item_add_texture_rect(ci, Rect2(ofs, decr->get_size()), incr->get_rid());
|
||||
Rect2 grabber_rect;
|
||||
|
||||
if (orientation==HORIZONTAL) {
|
||||
if (orientation == HORIZONTAL) {
|
||||
|
||||
grabber_rect.size.width=get_grabber_size();
|
||||
grabber_rect.size.height=get_size().height;
|
||||
grabber_rect.pos.y=0;
|
||||
grabber_rect.pos.x=get_grabber_offset()+decr->get_width()+bg->get_margin( MARGIN_LEFT );
|
||||
grabber_rect.size.width = get_grabber_size();
|
||||
grabber_rect.size.height = get_size().height;
|
||||
grabber_rect.pos.y = 0;
|
||||
grabber_rect.pos.x = get_grabber_offset() + decr->get_width() + bg->get_margin(MARGIN_LEFT);
|
||||
} else {
|
||||
|
||||
grabber_rect.size.width=get_size().width;
|
||||
grabber_rect.size.height=get_grabber_size();
|
||||
grabber_rect.pos.y=get_grabber_offset()+decr->get_height()+bg->get_margin( MARGIN_TOP );
|
||||
grabber_rect.pos.x=0;
|
||||
grabber_rect.size.width = get_size().width;
|
||||
grabber_rect.size.height = get_grabber_size();
|
||||
grabber_rect.pos.y = get_grabber_offset() + decr->get_height() + bg->get_margin(MARGIN_TOP);
|
||||
grabber_rect.pos.x = 0;
|
||||
}
|
||||
|
||||
grabber->draw(ci,grabber_rect);
|
||||
|
||||
grabber->draw(ci, grabber_rect);
|
||||
}
|
||||
|
||||
if (p_what==NOTIFICATION_ENTER_TREE) {
|
||||
|
||||
if (p_what == NOTIFICATION_ENTER_TREE) {
|
||||
|
||||
if (has_node(drag_slave_path)) {
|
||||
Node *n = get_node(drag_slave_path);
|
||||
drag_slave=n->cast_to<Control>();
|
||||
drag_slave = n->cast_to<Control>();
|
||||
}
|
||||
|
||||
if (drag_slave) {
|
||||
drag_slave->connect("input_event",this,"_drag_slave_input");
|
||||
drag_slave->connect("exit_tree",this,"_drag_slave_exit",varray(),CONNECT_ONESHOT);
|
||||
drag_slave->connect("input_event", this, "_drag_slave_input");
|
||||
drag_slave->connect("exit_tree", this, "_drag_slave_exit", varray(), CONNECT_ONESHOT);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
if (p_what==NOTIFICATION_EXIT_TREE) {
|
||||
if (p_what == NOTIFICATION_EXIT_TREE) {
|
||||
|
||||
if (drag_slave) {
|
||||
drag_slave->disconnect("input_event",this,"_drag_slave_input");
|
||||
drag_slave->disconnect("exit_tree",this,"_drag_slave_exit");
|
||||
drag_slave->disconnect("input_event", this, "_drag_slave_input");
|
||||
drag_slave->disconnect("exit_tree", this, "_drag_slave_exit");
|
||||
}
|
||||
|
||||
drag_slave=NULL;
|
||||
|
||||
drag_slave = NULL;
|
||||
}
|
||||
|
||||
if (p_what==NOTIFICATION_FIXED_PROCESS) {
|
||||
if (p_what == NOTIFICATION_FIXED_PROCESS) {
|
||||
|
||||
if (drag_slave_touching) {
|
||||
if (drag_slave_touching) {
|
||||
|
||||
if (drag_slave_touching_deaccel) {
|
||||
|
||||
Vector2 pos = Vector2(orientation==HORIZONTAL?get_val():0,orientation==VERTICAL?get_val():0);
|
||||
pos+=drag_slave_speed*get_fixed_process_delta_time();
|
||||
Vector2 pos = Vector2(orientation == HORIZONTAL ? get_val() : 0, orientation == VERTICAL ? get_val() : 0);
|
||||
pos += drag_slave_speed * get_fixed_process_delta_time();
|
||||
|
||||
bool turnoff=false;
|
||||
bool turnoff = false;
|
||||
|
||||
if (orientation==HORIZONTAL) {
|
||||
if (orientation == HORIZONTAL) {
|
||||
|
||||
if (pos.x<0) {
|
||||
pos.x=0;
|
||||
turnoff=true;
|
||||
if (pos.x < 0) {
|
||||
pos.x = 0;
|
||||
turnoff = true;
|
||||
}
|
||||
|
||||
if (pos.x > (get_max()-get_page())) {
|
||||
pos.x=get_max()-get_page();
|
||||
turnoff=true;
|
||||
if (pos.x > (get_max() - get_page())) {
|
||||
pos.x = get_max() - get_page();
|
||||
turnoff = true;
|
||||
}
|
||||
|
||||
set_val(pos.x);
|
||||
|
||||
float sgn_x = drag_slave_speed.x<0? -1 : 1;
|
||||
float sgn_x = drag_slave_speed.x < 0 ? -1 : 1;
|
||||
float val_x = Math::abs(drag_slave_speed.x);
|
||||
val_x-=1000*get_fixed_process_delta_time();
|
||||
val_x -= 1000 * get_fixed_process_delta_time();
|
||||
|
||||
if (val_x<0) {
|
||||
turnoff=true;
|
||||
if (val_x < 0) {
|
||||
turnoff = true;
|
||||
}
|
||||
|
||||
drag_slave_speed.x=sgn_x*val_x;
|
||||
drag_slave_speed.x = sgn_x * val_x;
|
||||
|
||||
} else {
|
||||
|
||||
|
||||
if (pos.y<0) {
|
||||
pos.y=0;
|
||||
turnoff=true;
|
||||
if (pos.y < 0) {
|
||||
pos.y = 0;
|
||||
turnoff = true;
|
||||
}
|
||||
|
||||
if (pos.y > (get_max()-get_page())) {
|
||||
pos.y=get_max()-get_page();
|
||||
turnoff=true;
|
||||
if (pos.y > (get_max() - get_page())) {
|
||||
pos.y = get_max() - get_page();
|
||||
turnoff = true;
|
||||
}
|
||||
|
||||
set_val(pos.y);
|
||||
|
||||
float sgn_y = drag_slave_speed.y<0? -1 : 1;
|
||||
float sgn_y = drag_slave_speed.y < 0 ? -1 : 1;
|
||||
float val_y = Math::abs(drag_slave_speed.y);
|
||||
val_y-=1000*get_fixed_process_delta_time();
|
||||
val_y -= 1000 * get_fixed_process_delta_time();
|
||||
|
||||
if (val_y<0) {
|
||||
turnoff=true;
|
||||
if (val_y < 0) {
|
||||
turnoff = true;
|
||||
}
|
||||
drag_slave_speed.y=sgn_y*val_y;
|
||||
drag_slave_speed.y = sgn_y * val_y;
|
||||
}
|
||||
|
||||
|
||||
if (turnoff) {
|
||||
set_fixed_process(false);
|
||||
drag_slave_touching=false;
|
||||
drag_slave_touching_deaccel=false;
|
||||
drag_slave_touching = false;
|
||||
drag_slave_touching_deaccel = false;
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
|
||||
|
||||
if (time_since_motion==0 || time_since_motion>0.1) {
|
||||
if (time_since_motion == 0 || time_since_motion > 0.1) {
|
||||
|
||||
Vector2 diff = drag_slave_accum - last_drag_slave_accum;
|
||||
last_drag_slave_accum=drag_slave_accum;
|
||||
drag_slave_speed=diff/get_fixed_process_delta_time();
|
||||
last_drag_slave_accum = drag_slave_accum;
|
||||
drag_slave_speed = diff / get_fixed_process_delta_time();
|
||||
}
|
||||
|
||||
time_since_motion+=get_fixed_process_delta_time();
|
||||
time_since_motion += get_fixed_process_delta_time();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (p_what==NOTIFICATION_MOUSE_EXIT) {
|
||||
if (p_what == NOTIFICATION_MOUSE_EXIT) {
|
||||
|
||||
hilite=HILITE_NONE;
|
||||
hilite = HILITE_NONE;
|
||||
update();
|
||||
}
|
||||
}
|
||||
|
||||
double ScrollBar::get_grabber_min_size() const {
|
||||
|
||||
Ref<StyleBox> grabber=get_stylebox("grabber");
|
||||
Size2 gminsize=grabber->get_minimum_size()+grabber->get_center_size();
|
||||
return (orientation==VERTICAL)?gminsize.height:gminsize.width;
|
||||
Ref<StyleBox> grabber = get_stylebox("grabber");
|
||||
Size2 gminsize = grabber->get_minimum_size() + grabber->get_center_size();
|
||||
return (orientation == VERTICAL) ? gminsize.height : gminsize.width;
|
||||
}
|
||||
|
||||
double ScrollBar::get_grabber_size() const {
|
||||
|
||||
float range = get_max()-get_min();
|
||||
if (range<=0)
|
||||
float range = get_max() - get_min();
|
||||
if (range <= 0)
|
||||
return 0;
|
||||
|
||||
float page = (get_page()>0)? get_page() : 0;
|
||||
// if (grabber_range < get_step())
|
||||
// grabber_range=get_step();
|
||||
float page = (get_page() > 0) ? get_page() : 0;
|
||||
// if (grabber_range < get_step())
|
||||
// grabber_range=get_step();
|
||||
|
||||
double area_size=get_area_size();
|
||||
double area_size = get_area_size();
|
||||
double grabber_size = page / range * area_size;
|
||||
return grabber_size+get_grabber_min_size();
|
||||
|
||||
return grabber_size + get_grabber_min_size();
|
||||
}
|
||||
|
||||
double ScrollBar::get_area_size() const {
|
||||
|
||||
if (orientation==VERTICAL) {
|
||||
if (orientation == VERTICAL) {
|
||||
|
||||
double area=get_size().height;
|
||||
area-=get_stylebox("scroll")->get_minimum_size().height;
|
||||
area-=get_icon("increment")->get_height();
|
||||
area-=get_icon("decrement")->get_height();
|
||||
area-=get_grabber_min_size();
|
||||
double area = get_size().height;
|
||||
area -= get_stylebox("scroll")->get_minimum_size().height;
|
||||
area -= get_icon("increment")->get_height();
|
||||
area -= get_icon("decrement")->get_height();
|
||||
area -= get_grabber_min_size();
|
||||
return area;
|
||||
|
||||
} else if (orientation==HORIZONTAL) {
|
||||
} else if (orientation == HORIZONTAL) {
|
||||
|
||||
double area=get_size().width;
|
||||
area-=get_stylebox("scroll")->get_minimum_size().width;
|
||||
area-=get_icon("increment")->get_width();
|
||||
area-=get_icon("decrement")->get_width();
|
||||
area-=get_grabber_min_size();
|
||||
double area = get_size().width;
|
||||
area -= get_stylebox("scroll")->get_minimum_size().width;
|
||||
area -= get_icon("increment")->get_width();
|
||||
area -= get_icon("decrement")->get_width();
|
||||
area -= get_grabber_min_size();
|
||||
return area;
|
||||
} else {
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
double ScrollBar::get_area_offset() const {
|
||||
|
||||
double ofs=0;
|
||||
double ofs = 0;
|
||||
|
||||
if (orientation==VERTICAL) {
|
||||
|
||||
ofs+=get_stylebox("hscroll")->get_margin( MARGIN_TOP );
|
||||
ofs+=get_icon("decrement")->get_height();
|
||||
if (orientation == VERTICAL) {
|
||||
|
||||
ofs += get_stylebox("hscroll")->get_margin(MARGIN_TOP);
|
||||
ofs += get_icon("decrement")->get_height();
|
||||
}
|
||||
|
||||
if (orientation==HORIZONTAL) {
|
||||
if (orientation == HORIZONTAL) {
|
||||
|
||||
ofs+=get_stylebox("hscroll")->get_margin( MARGIN_LEFT );
|
||||
ofs+=get_icon("decrement")->get_width();
|
||||
ofs += get_stylebox("hscroll")->get_margin(MARGIN_LEFT);
|
||||
ofs += get_icon("decrement")->get_width();
|
||||
}
|
||||
|
||||
return ofs;
|
||||
}
|
||||
|
||||
double ScrollBar::get_click_pos(const Point2& p_pos) const {
|
||||
double ScrollBar::get_click_pos(const Point2 &p_pos) const {
|
||||
|
||||
float pos = (orientation == VERTICAL) ? p_pos.y : p_pos.x;
|
||||
pos -= get_area_offset();
|
||||
|
||||
float pos=(orientation==VERTICAL)?p_pos.y:p_pos.x;
|
||||
pos-=get_area_offset();
|
||||
|
||||
float area=get_area_size();
|
||||
if (area==0)
|
||||
float area = get_area_size();
|
||||
if (area == 0)
|
||||
return 0;
|
||||
else
|
||||
return pos/area;
|
||||
|
||||
return pos / area;
|
||||
}
|
||||
|
||||
double ScrollBar::get_grabber_offset() const {
|
||||
|
||||
|
||||
return (get_area_size()) * get_unit_value();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Size2 ScrollBar::get_minimum_size() const {
|
||||
|
||||
Ref<Texture> incr = get_icon("increment");
|
||||
@@ -510,31 +476,30 @@ Size2 ScrollBar::get_minimum_size() const {
|
||||
Ref<StyleBox> bg = get_stylebox("scroll");
|
||||
Size2 minsize;
|
||||
|
||||
if (orientation==VERTICAL) {
|
||||
if (orientation == VERTICAL) {
|
||||
|
||||
minsize.width=MAX(incr->get_size().width,(bg->get_minimum_size()+bg->get_center_size()).width);
|
||||
minsize.height+=incr->get_size().height;
|
||||
minsize.height+=decr->get_size().height;
|
||||
minsize.height+=bg->get_minimum_size().height;
|
||||
minsize.height+=get_grabber_min_size();
|
||||
minsize.width = MAX(incr->get_size().width, (bg->get_minimum_size() + bg->get_center_size()).width);
|
||||
minsize.height += incr->get_size().height;
|
||||
minsize.height += decr->get_size().height;
|
||||
minsize.height += bg->get_minimum_size().height;
|
||||
minsize.height += get_grabber_min_size();
|
||||
}
|
||||
|
||||
if (orientation==HORIZONTAL) {
|
||||
if (orientation == HORIZONTAL) {
|
||||
|
||||
minsize.height=MAX(incr->get_size().height,(bg->get_center_size()+bg->get_minimum_size()).height);
|
||||
minsize.width+=incr->get_size().width;
|
||||
minsize.width+=decr->get_size().width;
|
||||
minsize.width+=bg->get_minimum_size().width;
|
||||
minsize.width+=get_grabber_min_size();
|
||||
minsize.height = MAX(incr->get_size().height, (bg->get_center_size() + bg->get_minimum_size()).height);
|
||||
minsize.width += incr->get_size().width;
|
||||
minsize.width += decr->get_size().width;
|
||||
minsize.width += bg->get_minimum_size().width;
|
||||
minsize.width += get_grabber_min_size();
|
||||
}
|
||||
|
||||
return minsize;
|
||||
|
||||
}
|
||||
|
||||
void ScrollBar::set_custom_step(float p_custom_step) {
|
||||
|
||||
custom_step=p_custom_step;
|
||||
custom_step = p_custom_step;
|
||||
}
|
||||
|
||||
float ScrollBar::get_custom_step() const {
|
||||
@@ -542,53 +507,50 @@ float ScrollBar::get_custom_step() const {
|
||||
return custom_step;
|
||||
}
|
||||
|
||||
|
||||
void ScrollBar::_drag_slave_exit() {
|
||||
|
||||
if (drag_slave) {
|
||||
drag_slave->disconnect("input_event",this,"_drag_slave_input");
|
||||
drag_slave->disconnect("input_event", this, "_drag_slave_input");
|
||||
}
|
||||
drag_slave=NULL;
|
||||
drag_slave = NULL;
|
||||
}
|
||||
|
||||
void ScrollBar::_drag_slave_input(const InputEvent &p_input) {
|
||||
|
||||
void ScrollBar::_drag_slave_input(const InputEvent& p_input) {
|
||||
|
||||
switch(p_input.type) {
|
||||
switch (p_input.type) {
|
||||
|
||||
case InputEvent::MOUSE_BUTTON: {
|
||||
|
||||
const InputEventMouseButton &mb=p_input.mouse_button;
|
||||
const InputEventMouseButton &mb = p_input.mouse_button;
|
||||
|
||||
if (mb.button_index!=1)
|
||||
if (mb.button_index != 1)
|
||||
break;
|
||||
|
||||
if (mb.pressed) {
|
||||
|
||||
if (drag_slave_touching) {
|
||||
set_fixed_process(false);
|
||||
drag_slave_touching_deaccel=false;
|
||||
drag_slave_touching=false;
|
||||
drag_slave_speed=Vector2();
|
||||
drag_slave_accum=Vector2();
|
||||
last_drag_slave_accum=Vector2();
|
||||
drag_slave_from=Vector2();
|
||||
drag_slave_touching_deaccel = false;
|
||||
drag_slave_touching = false;
|
||||
drag_slave_speed = Vector2();
|
||||
drag_slave_accum = Vector2();
|
||||
last_drag_slave_accum = Vector2();
|
||||
drag_slave_from = Vector2();
|
||||
}
|
||||
|
||||
if (true) {
|
||||
drag_slave_speed=Vector2();
|
||||
drag_slave_accum=Vector2();
|
||||
last_drag_slave_accum=Vector2();
|
||||
drag_slave_speed = Vector2();
|
||||
drag_slave_accum = Vector2();
|
||||
last_drag_slave_accum = Vector2();
|
||||
//drag_slave_from=Vector2(h_scroll->get_val(),v_scroll->get_val());
|
||||
drag_slave_from= Vector2(orientation==HORIZONTAL?get_val():0,orientation==VERTICAL?get_val():0);
|
||||
drag_slave_from = Vector2(orientation == HORIZONTAL ? get_val() : 0, orientation == VERTICAL ? get_val() : 0);
|
||||
|
||||
drag_slave_touching=OS::get_singleton()->has_touchscreen_ui_hint();
|
||||
drag_slave_touching_deaccel=false;
|
||||
time_since_motion=0;
|
||||
drag_slave_touching = OS::get_singleton()->has_touchscreen_ui_hint();
|
||||
drag_slave_touching_deaccel = false;
|
||||
time_since_motion = 0;
|
||||
if (drag_slave_touching) {
|
||||
set_fixed_process(true);
|
||||
time_since_motion=0;
|
||||
|
||||
time_since_motion = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -596,78 +558,75 @@ void ScrollBar::_drag_slave_input(const InputEvent& p_input) {
|
||||
|
||||
if (drag_slave_touching) {
|
||||
|
||||
if (drag_slave_speed==Vector2()) {
|
||||
drag_slave_touching_deaccel=false;
|
||||
drag_slave_touching=false;
|
||||
if (drag_slave_speed == Vector2()) {
|
||||
drag_slave_touching_deaccel = false;
|
||||
drag_slave_touching = false;
|
||||
set_fixed_process(false);
|
||||
} else {
|
||||
|
||||
drag_slave_touching_deaccel=true;
|
||||
drag_slave_touching_deaccel = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
} break;
|
||||
case InputEvent::MOUSE_MOTION: {
|
||||
|
||||
const InputEventMouseMotion &mm=p_input.mouse_motion;
|
||||
const InputEventMouseMotion &mm = p_input.mouse_motion;
|
||||
|
||||
if (drag_slave_touching && ! drag_slave_touching_deaccel) {
|
||||
if (drag_slave_touching && !drag_slave_touching_deaccel) {
|
||||
|
||||
Vector2 motion = Vector2(mm.relative_x,mm.relative_y);
|
||||
Vector2 motion = Vector2(mm.relative_x, mm.relative_y);
|
||||
|
||||
drag_slave_accum-=motion;
|
||||
Vector2 diff = drag_slave_from+drag_slave_accum;
|
||||
drag_slave_accum -= motion;
|
||||
Vector2 diff = drag_slave_from + drag_slave_accum;
|
||||
|
||||
if (orientation==HORIZONTAL)
|
||||
if (orientation == HORIZONTAL)
|
||||
set_val(diff.x);
|
||||
//else
|
||||
// drag_slave_accum.x=0;
|
||||
if (orientation==VERTICAL)
|
||||
if (orientation == VERTICAL)
|
||||
set_val(diff.y);
|
||||
//else
|
||||
// drag_slave_accum.y=0;
|
||||
time_since_motion=0;
|
||||
time_since_motion = 0;
|
||||
}
|
||||
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
void ScrollBar::set_drag_slave(const NodePath& p_path) {
|
||||
void ScrollBar::set_drag_slave(const NodePath &p_path) {
|
||||
|
||||
if (is_inside_tree()) {
|
||||
|
||||
if (drag_slave) {
|
||||
drag_slave->disconnect("input_event",this,"_drag_slave_input");
|
||||
drag_slave->disconnect("exit_tree",this,"_drag_slave_exit");
|
||||
drag_slave->disconnect("input_event", this, "_drag_slave_input");
|
||||
drag_slave->disconnect("exit_tree", this, "_drag_slave_exit");
|
||||
}
|
||||
}
|
||||
|
||||
drag_slave=NULL;
|
||||
drag_slave_path=p_path;
|
||||
drag_slave = NULL;
|
||||
drag_slave_path = p_path;
|
||||
|
||||
if (is_inside_tree()) {
|
||||
|
||||
if (has_node(p_path)) {
|
||||
Node *n = get_node(p_path);
|
||||
drag_slave=n->cast_to<Control>();
|
||||
drag_slave = n->cast_to<Control>();
|
||||
}
|
||||
|
||||
if (drag_slave) {
|
||||
drag_slave->connect("input_event",this,"_drag_slave_input");
|
||||
drag_slave->connect("exit_tree",this,"_drag_slave_exit",varray(),CONNECT_ONESHOT);
|
||||
drag_slave->connect("input_event", this, "_drag_slave_input");
|
||||
drag_slave->connect("exit_tree", this, "_drag_slave_exit", varray(), CONNECT_ONESHOT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NodePath ScrollBar::get_drag_slave() const{
|
||||
|
||||
NodePath ScrollBar::get_drag_slave() const {
|
||||
|
||||
return drag_slave_path;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#if 0
|
||||
|
||||
void ScrollBar::mouse_button(const Point2& p_pos, int b.button_index,bool b.pressed,int p_modifier_mask) {
|
||||
@@ -798,48 +757,36 @@ bool ScrollBar::key(unsigned long p_unicode, unsigned long p_scan_code,bool b.pr
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
void ScrollBar::_bind_methods() {
|
||||
|
||||
ObjectTypeDB::bind_method(_MD("_input_event"),&ScrollBar::_input_event);
|
||||
ObjectTypeDB::bind_method(_MD("set_custom_step","step"),&ScrollBar::set_custom_step);
|
||||
ObjectTypeDB::bind_method(_MD("get_custom_step"),&ScrollBar::get_custom_step);
|
||||
ObjectTypeDB::bind_method(_MD("_drag_slave_input"),&ScrollBar::_drag_slave_input);
|
||||
ObjectTypeDB::bind_method(_MD("_drag_slave_exit"),&ScrollBar::_drag_slave_exit);
|
||||
|
||||
ADD_PROPERTY( PropertyInfo(Variant::REAL,"custom_step",PROPERTY_HINT_RANGE,"-1,4096"), _SCS("set_custom_step"),_SCS("get_custom_step"));
|
||||
ObjectTypeDB::bind_method(_MD("_input_event"), &ScrollBar::_input_event);
|
||||
ObjectTypeDB::bind_method(_MD("set_custom_step", "step"), &ScrollBar::set_custom_step);
|
||||
ObjectTypeDB::bind_method(_MD("get_custom_step"), &ScrollBar::get_custom_step);
|
||||
ObjectTypeDB::bind_method(_MD("_drag_slave_input"), &ScrollBar::_drag_slave_input);
|
||||
ObjectTypeDB::bind_method(_MD("_drag_slave_exit"), &ScrollBar::_drag_slave_exit);
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::REAL, "custom_step", PROPERTY_HINT_RANGE, "-1,4096"), _SCS("set_custom_step"), _SCS("get_custom_step"));
|
||||
}
|
||||
|
||||
ScrollBar::ScrollBar(Orientation p_orientation) {
|
||||
|
||||
ScrollBar::ScrollBar(Orientation p_orientation)
|
||||
{
|
||||
orientation = p_orientation;
|
||||
hilite = HILITE_NONE;
|
||||
custom_step = -1;
|
||||
drag_slave = NULL;
|
||||
|
||||
drag.active = false;
|
||||
|
||||
orientation=p_orientation;
|
||||
hilite=HILITE_NONE;
|
||||
custom_step=-1;
|
||||
drag_slave=NULL;
|
||||
|
||||
drag.active=false;
|
||||
|
||||
drag_slave_speed=Vector2();
|
||||
drag_slave_touching=false;
|
||||
drag_slave_touching_deaccel=false;
|
||||
drag_slave_speed = Vector2();
|
||||
drag_slave_touching = false;
|
||||
drag_slave_touching_deaccel = false;
|
||||
|
||||
if (focus_by_default)
|
||||
set_focus_mode( FOCUS_ALL );
|
||||
set_focus_mode(FOCUS_ALL);
|
||||
set_step(0);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
ScrollBar::~ScrollBar()
|
||||
{
|
||||
ScrollBar::~ScrollBar() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user