asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #13342 from Noshyaar/just_godot

Browse source 
EditorAbout: single-column'd some section, monospace
This commit is contained in:
Rémi Verschelde 2017-11-27 23:03:43 +01:00 committed by GitHub
commit 9a406da44e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
editor/editor_about.cpp
View file

@ -28,6 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "editor_about.h" #include "editor_about.h"
#include "editor_node.h"
#include "authors.gen.h" #include "authors.gen.h"
#include "donors.gen.h" #include "donors.gen.h"
@ -35,6 +36,20 @@
#include "version.h" #include "version.h"
#include "version_hash.gen.h" #include "version_hash.gen.h"
void EditorAbout::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE:
case NOTIFICATION_THEME_CHANGED: {
Ref<Font> font = EditorNode::get_singleton()->get_gui_base()->get_font("source", "EditorFonts");
_tpl_text->add_font_override("font", font);
_license_text->add_font_override("font", font);
} break;
}
}
void EditorAbout::_license_tree_selected() { void EditorAbout::_license_tree_selected() {
TreeItem *selected = _tpl_tree->get_selected(); TreeItem *selected = _tpl_tree->get_selected();
@ -52,7 +67,7 @@ TextureRect *EditorAbout::get_logo() const {
return _logo; return _logo;
} }
ScrollContainer *EditorAbout::_populate_list(const String &p_name, const List<String> &p_sections, const char **p_src[]) { ScrollContainer *EditorAbout::_populate_list(const String &p_name, const List<String> &p_sections, const char **p_src[], const int p_flag_single_column) {
ScrollContainer *sc = memnew(ScrollContainer); ScrollContainer *sc = memnew(ScrollContainer);
sc->set_name(p_name); sc->set_name(p_name);
@ -64,6 +79,7 @@ ScrollContainer *EditorAbout::_populate_list(const String &p_name, const List<St
for (int i = 0; i < p_sections.size(); i++) { for (int i = 0; i < p_sections.size(); i++) {
bool single_column = p_flag_single_column & 1 << i;
const char **names_ptr = p_src[i]; const char **names_ptr = p_src[i];
if (*names_ptr) { if (*names_ptr) {
@ -72,17 +88,16 @@ ScrollContainer *EditorAbout::_populate_list(const String &p_name, const List<St
vbc->add_child(lbl); vbc->add_child(lbl);
ItemList *il = memnew(ItemList); ItemList *il = memnew(ItemList);
il->set_max_columns(16);
il->set_h_size_flags(Control::SIZE_EXPAND_FILL); il->set_h_size_flags(Control::SIZE_EXPAND_FILL);
il->set_same_column_width(true); il->set_same_column_width(true);
il->set_auto_height(true); il->set_auto_height(true);
il->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
il->add_constant_override("hseparation", 16 * EDSCALE);
while (*names_ptr) { while (*names_ptr) {
il->add_item(String::utf8(*names_ptr++), NULL, false); il->add_item(String::utf8(*names_ptr++), NULL, false);
} }
il->set_max_columns(il->get_item_count() < 4 || single_column ? 1 : 16);
vbc->add_child(il); vbc->add_child(il);
if (il->get_item_count() == 2) {
il->set_fixed_column_width(200 * EDSCALE);
}
HSeparator *hs = memnew(HSeparator); HSeparator *hs = memnew(HSeparator);
hs->set_modulate(Color(0, 0, 0, 0)); hs->set_modulate(Color(0, 0, 0, 0));
@ -134,7 +149,7 @@ EditorAbout::EditorAbout() {
dev_sections.push_back(TTR("Project Manager")); dev_sections.push_back(TTR("Project Manager"));
dev_sections.push_back(TTR("Developers")); dev_sections.push_back(TTR("Developers"));
const char **dev_src[] = { dev_founders, dev_lead, dev_manager, dev_names }; const char **dev_src[] = { dev_founders, dev_lead, dev_manager, dev_names };
tc->add_child(_populate_list(TTR("Authors"), dev_sections, dev_src)); tc->add_child(_populate_list(TTR("Authors"), dev_sections, dev_src, 1));
// Donors // Donors
@ -146,18 +161,18 @@ EditorAbout::EditorAbout() {
donor_sections.push_back(TTR("Silver Donors")); donor_sections.push_back(TTR("Silver Donors"));
donor_sections.push_back(TTR("Bronze Donors")); donor_sections.push_back(TTR("Bronze Donors"));
const char **donor_src[] = { donor_s_plat, donor_s_gold, donor_s_mini, donor_gold, donor_silver, donor_bronze }; const char **donor_src[] = { donor_s_plat, donor_s_gold, donor_s_mini, donor_gold, donor_silver, donor_bronze };
tc->add_child(_populate_list(TTR("Donors"), donor_sections, donor_src)); tc->add_child(_populate_list(TTR("Donors"), donor_sections, donor_src, 3));
// License // License
TextEdit *license = memnew(TextEdit); _license_text = memnew(TextEdit);
license->set_name(TTR("License")); _license_text->set_name(TTR("License"));
license->set_h_size_flags(Control::SIZE_EXPAND_FILL); _license_text->set_h_size_flags(Control::SIZE_EXPAND_FILL);
license->set_v_size_flags(Control::SIZE_EXPAND_FILL); _license_text->set_v_size_flags(Control::SIZE_EXPAND_FILL);
license->set_wrap(true); _license_text->set_wrap(true);
license->set_readonly(true); _license_text->set_readonly(true);
license->set_text(String::utf8(about_license)); _license_text->set_text(String::utf8(about_license));
tc->add_child(license); tc->add_child(_license_text);
// Thirdparty License // Thirdparty License

4
editor/editor_about.h
View file

@ -52,13 +52,15 @@ class EditorAbout : public AcceptDialog {
private: private:
void _license_tree_selected(); void _license_tree_selected();
ScrollContainer *_populate_list(const String &p_name, const List<String> &p_sections, const char **p_src[]); ScrollContainer *_populate_list(const String &p_name, const List<String> &p_sections, const char **p_src[], const int p_flag_single_column = 0);
Tree *_tpl_tree; Tree *_tpl_tree;
TextEdit *_license_text;
TextEdit *_tpl_text; TextEdit *_tpl_text;
TextureRect *_logo; TextureRect *_logo;
protected: protected:
void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
public: public: