Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #10096 from toger5/label_stylebox

Browse source 
fixed Import LineEdit to label + label stylebox
This commit is contained in:
Rémi Verschelde 2017-08-31 13:58:52 +02:00 • committed by GitHub
commit b7f4dcbdd1
4 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
editor/import_dock.cpp
View file

@ -28,6 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "import_dock.h"
#include "editor_node.h"
class ImportDockParameters : public Object {
GDCLASS(ImportDockParameters, Object)
@ -365,8 +366,8 @@ void ImportDock::initialize_import_options() const {
ImportDock::ImportDock() {
imported = memnew(LineEdit);
imported->set_editable(false);
imported = memnew(Label);
imported->add_style_override("normal", EditorNode::get_singleton()->get_gui_base()->get_stylebox("normal", "LineEdit"));
add_child(imported);
HBoxContainer *hb = memnew(HBoxContainer);
add_margin_child(TTR("Import As:"), hb);

2
editor/import_dock.h
View file

@ -41,7 +41,7 @@ class ImportDockParameters;
class ImportDock : public VBoxContainer {
GDCLASS(ImportDock, VBoxContainer)
LineEdit *imported;
Label *imported;
OptionButton *import_as;
MenuButton *preset;
PropertyEditor *import_opts;