godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dead ButtonGroup code

Browse Source
This commit is contained in:
Rémi Verschelde 2017-09-06 14:41:34 +02:00
parent ddadc782ba
commit 0b8fa1e010
13 changed files with 0 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/plugins/canvas_item_editor_plugin.h
View File

@ -34,7 +34,6 @@
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#include "scene/2d/canvas_item.h" #include "scene/2d/canvas_item.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
#include "scene/gui/button_group.h"
#include "scene/gui/check_box.h" #include "scene/gui/check_box.h"
#include "scene/gui/label.h" #include "scene/gui/label.h"
#include "scene/gui/panel_container.h" #include "scene/gui/panel_container.h"

1
editor/plugins/collision_polygon_2d_editor_plugin.h
View File

@ -33,7 +33,6 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#include "scene/2d/collision_polygon_2d.h" #include "scene/2d/collision_polygon_2d.h"
#include "scene/gui/button_group.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
/** /**

1
editor/plugins/collision_polygon_editor_plugin.h
View File

@ -35,7 +35,6 @@
#include "scene/3d/collision_polygon.h" #include "scene/3d/collision_polygon.h"
#include "scene/3d/immediate_geometry.h" #include "scene/3d/immediate_geometry.h"
#include "scene/3d/mesh_instance.h" #include "scene/3d/mesh_instance.h"
#include "scene/gui/button_group.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
/** /**

1
editor/plugins/light_occluder_2d_editor_plugin.h
View File

@ -33,7 +33,6 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#include "scene/2d/light_occluder_2d.h" #include "scene/2d/light_occluder_2d.h"
#include "scene/gui/button_group.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
/** /**

1
editor/plugins/line_2d_editor_plugin.h
View File

@ -34,7 +34,6 @@
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#include "scene/2d/line_2d.h" #include "scene/2d/line_2d.h"
#include "scene/2d/path_2d.h" #include "scene/2d/path_2d.h"
#include "scene/gui/button_group.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
class CanvasItemEditor; class CanvasItemEditor;

1
editor/plugins/navigation_polygon_editor_plugin.h
View File

@ -33,7 +33,6 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#include "scene/2d/navigation_polygon.h" #include "scene/2d/navigation_polygon.h"
#include "scene/gui/button_group.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
/** /**

1
editor/plugins/path_2d_editor_plugin.h
View File

@ -33,7 +33,6 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#include "scene/2d/path_2d.h" #include "scene/2d/path_2d.h"
#include "scene/gui/button_group.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
/** /**

1
editor/plugins/polygon_2d_editor_plugin.h
View File

@ -33,7 +33,6 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#include "scene/2d/polygon_2d.h" #include "scene/2d/polygon_2d.h"
#include "scene/gui/button_group.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
/** /**

1
editor/plugins/theme_editor_plugin.h
View File

@ -30,7 +30,6 @@
#ifndef THEME_EDITOR_PLUGIN_H #ifndef THEME_EDITOR_PLUGIN_H
#define THEME_EDITOR_PLUGIN_H #define THEME_EDITOR_PLUGIN_H
#include "scene/gui/button_group.h"
#include "scene/gui/check_box.h" #include "scene/gui/check_box.h"
#include "scene/gui/file_dialog.h" #include "scene/gui/file_dialog.h"
#include "scene/gui/option_button.h" #include "scene/gui/option_button.h"

168
scene/gui/button_group.cpp
View File

@ -1,168 +0,0 @@
/*************************************************************************/
/* button_group.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "button_group.h"
#if 0
#include "base_button.h"
void ButtonGroup::_add_button(BaseButton *p_button) {
buttons.insert(p_button);
p_button->set_toggle_mode(true);
p_button->set_click_on_press(true);
p_button->connect("pressed",this,"_pressed",make_binds(p_button));
}
void ButtonGroup::_remove_button(BaseButton *p_button){
buttons.erase(p_button);
p_button->disconnect("pressed",this,"_pressed");
}
void ButtonGroup::set_pressed_button(BaseButton *p_button) {
_pressed(p_button);
}
void ButtonGroup::_pressed(Object *p_button) {
ERR_FAIL_NULL(p_button);
BaseButton *b=Object::cast_to<BaseButton>(p_button);
ERR_FAIL_COND(!b);
for(Set<BaseButton*>::Element *E=buttons.front();E;E=E->next()) {
BaseButton *bb=E->get();
bb->set_pressed( b==bb );
if (b==bb){
emit_signal("button_selected", b);
}
}
}
Array ButtonGroup::_get_button_list() const {
List<BaseButton*> b;
get_button_list(&b);
b.sort_custom<Node::Comparator>();
Array arr;
arr.resize(b.size());
int idx=0;
for(List<BaseButton*>::Element *E=b.front();E;E=E->next(),idx++) {
arr[idx]=E->get();
}
return arr;
}
void ButtonGroup::get_button_list(List<BaseButton*> *p_buttons) const {
for(Set<BaseButton*>::Element *E=buttons.front();E;E=E->next()) {
p_buttons->push_back(E->get());
}
}
BaseButton *ButtonGroup::get_pressed_button() const {
for(Set<BaseButton*>::Element *E=buttons.front();E;E=E->next()) {
if (E->get()->is_pressed())
return E->get();
}
return NULL;
}
BaseButton *ButtonGroup::get_focused_button() const{
for(Set<BaseButton*>::Element *E=buttons.front();E;E=E->next()) {
if (E->get()->has_focus())
return E->get();
}
return NULL;
}
int ButtonGroup::get_pressed_button_index() const {
//in tree order, this is bizarre
ERR_FAIL_COND_V(!is_inside_tree(),0);
BaseButton *pressed = get_pressed_button();
if (!pressed)
return -1;
List<BaseButton*> blist;
for(Set<BaseButton*>::Element *E=buttons.front();E;E=E->next()) {
blist.push_back(E->get());
}
blist.sort_custom<Node::Comparator>();
int idx=0;
for(List<BaseButton*>::Element *E=blist.front();E;E=E->next()) {
if (E->get()==pressed)
return idx;
idx++;
}
return -1;
}
void ButtonGroup::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_pressed_button"),&ButtonGroup::get_pressed_button);
ClassDB::bind_method(D_METHOD("get_pressed_button_index"),&ButtonGroup::get_pressed_button_index);
ClassDB::bind_method(D_METHOD("get_focused_button"),&ButtonGroup::get_focused_button);
ClassDB::bind_method(D_METHOD("get_button_list"),&ButtonGroup::_get_button_list);
ClassDB::bind_method(D_METHOD("_pressed"),&ButtonGroup::_pressed);
ClassDB::bind_method(D_METHOD("set_pressed_button","button"),&ButtonGroup::_pressed);
ADD_SIGNAL( MethodInfo("button_selected",PropertyInfo(Variant::OBJECT,"button",PROPERTY_HINT_RESOURCE_TYPE,"BaseButton")));
}
ButtonGroup::ButtonGroup() : BoxContainer(true)
{
}
#endif

68
scene/gui/button_group.h
View File

@ -1,68 +0,0 @@
/*************************************************************************/
/* button_group.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef BUTTON_GROUP_H
#define BUTTON_GROUP_H
#include "scene/gui/box_container.h"
#if 0
class BaseButton;
class ButtonGroup : public BoxContainer {
GDCLASS(ButtonGroup,BoxContainer);
Set<BaseButton*> buttons;
Array _get_button_list() const;
void _pressed(Object *p_button);
protected:
friend class BaseButton;
void _add_button(BaseButton *p_button);
void _remove_button(BaseButton *p_button);
static void _bind_methods();
public:
void get_button_list(List<BaseButton*> *p_buttons) const;
BaseButton *get_pressed_button() const;
BaseButton *get_focused_button() const;
void set_pressed_button(BaseButton *p_button);
int get_pressed_button_index() const;
ButtonGroup();
};
#endif
#endif // BUTTON_GROUP_H

1
scene/gui/check_box.cpp
View File

@ -29,7 +29,6 @@
/*************************************************************************/ /*************************************************************************/
#include "check_box.h" #include "check_box.h"
#include "button_group.h"
#include "servers/visual_server.h" #include "servers/visual_server.h"
void CheckBox::_notification(int p_what) { void CheckBox::_notification(int p_what) {

1
scene/register_scene_types.cpp
View File

@ -66,7 +66,6 @@
#include "scene/audio/audio_player.h" #include "scene/audio/audio_player.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
#include "scene/gui/button.h" #include "scene/gui/button.h"
#include "scene/gui/button_group.h"
#include "scene/gui/center_container.h" #include "scene/gui/center_container.h"
#include "scene/gui/check_box.h" #include "scene/gui/check_box.h"
#include "scene/gui/check_button.h" #include "scene/gui/check_button.h"