mirror of
https://github.com/godotengine/godot
synced 2024-09-05 02:18:26 +00:00
C#: Move build button to EditorRunBar
- Move C# build button to `EditorRunBar`. - Add C# build icon. - Add shortcut macros to `GodotTools`. - Move C# build shortcuts to C#.
This commit is contained in:
Raul Santos
parent
725beaa7af
commit
03598062fd
|
|
@ -348,6 +348,10 @@ bool EditorRunBar::is_movie_maker_enabled() const {
|
|||
return write_movie_button->is_pressed();
|
||||
}
|
||||
|
||||
HBoxContainer *EditorRunBar::get_buttons_container() {
|
||||
return main_hbox;
|
||||
}
|
||||
|
||||
void EditorRunBar::_bind_methods() {
|
||||
ADD_SIGNAL(MethodInfo("play_pressed"));
|
||||
ADD_SIGNAL(MethodInfo("stop_pressed"));
|
||||
|
|
@ -359,7 +363,7 @@ EditorRunBar::EditorRunBar() {
|
|||
main_panel = memnew(PanelContainer);
|
||||
add_child(main_panel);
|
||||
|
||||
HBoxContainer *main_hbox = memnew(HBoxContainer);
|
||||
main_hbox = memnew(HBoxContainer);
|
||||
main_panel->add_child(main_hbox);
|
||||
|
||||
play_button = memnew(Button);
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ class Button;
|
|||
class EditorRunNative;
|
||||
class EditorQuickOpen;
|
||||
class PanelContainer;
|
||||
class HBoxContainer;
|
||||
|
||||
class EditorRunBar : public MarginContainer {
|
||||
GDCLASS(EditorRunBar, MarginContainer);
|
||||
|
|
@ -53,6 +54,7 @@ class EditorRunBar : public MarginContainer {
|
|||
};
|
||||
|
||||
PanelContainer *main_panel = nullptr;
|
||||
HBoxContainer *main_hbox = nullptr;
|
||||
|
||||
Button *play_button = nullptr;
|
||||
Button *pause_button = nullptr;
|
||||
|
|
@ -109,6 +111,8 @@ public:
|
|||
|
||||
Button *get_pause_button() { return pause_button; }
|
||||
|
||||
HBoxContainer *get_buttons_container();
|
||||
|
||||
EditorRunBar();
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1197,8 +1197,6 @@ void CSharpLanguage::_editor_init_callback() {
|
|||
|
||||
// Add plugin to EditorNode and enable it
|
||||
EditorNode::add_editor_plugin(godotsharp_editor);
|
||||
ED_SHORTCUT("mono/build_solution", TTR("Build Solution"), KeyModifierMask::ALT | Key::B);
|
||||
ED_SHORTCUT_OVERRIDE("mono/build_solution", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::B);
|
||||
godotsharp_editor->enable_plugin();
|
||||
|
||||
get_singleton()->godotsharp_editor = godotsharp_editor;
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ namespace GodotTools.Build
|
|||
var toolBarHBox = new HBoxContainer { SizeFlagsHorizontal = SizeFlags.ExpandFill };
|
||||
AddChild(toolBarHBox);
|
||||
|
||||
_buildMenuBtn = new MenuButton { Text = "Build", Icon = GetThemeIcon("Play", "EditorIcons") };
|
||||
_buildMenuBtn = new MenuButton { Text = "Build", Icon = GetThemeIcon("BuildCSharp", "EditorIcons") };
|
||||
toolBarHBox.AddChild(_buildMenuBtn);
|
||||
|
||||
var buildMenu = _buildMenuBtn.GetPopup();
|
||||
|
|
@ -184,7 +184,7 @@ namespace GodotTools.Build
|
|||
if (what == NotificationThemeChanged)
|
||||
{
|
||||
if (_buildMenuBtn != null)
|
||||
_buildMenuBtn.Icon = GetThemeIcon("Play", "EditorIcons");
|
||||
_buildMenuBtn.Icon = GetThemeIcon("BuildCSharp", "EditorIcons");
|
||||
if (_errorsBtn != null)
|
||||
_errorsBtn.Icon = GetThemeIcon("StatusError", "EditorIcons");
|
||||
if (_warningsBtn != null)
|
||||
|
|
|
|||
|
|
@ -497,18 +497,20 @@ namespace GodotTools
|
|||
|
||||
AddToolSubmenuItem("C#", _menuPopup);
|
||||
|
||||
var buildSolutionShortcut = (Shortcut)EditorShortcut("mono/build_solution");
|
||||
|
||||
_toolBarBuildButton = new Button
|
||||
{
|
||||
Text = "Build",
|
||||
TooltipText = "Build Solution".TTR(),
|
||||
Flat = true,
|
||||
Icon = editorBaseControl.GetThemeIcon("BuildCSharp", "EditorIcons"),
|
||||
FocusMode = Control.FocusModeEnum.None,
|
||||
Shortcut = buildSolutionShortcut,
|
||||
ShortcutInTooltip = true
|
||||
Shortcut = EditorDefShortcut("mono/build_solution", "Build Project".TTR(), (Key)KeyModifierMask.MaskAlt | Key.B),
|
||||
ShortcutInTooltip = true,
|
||||
};
|
||||
EditorShortcutOverride("mono/build_solution", "macos", (Key)KeyModifierMask.MaskMeta | (Key)KeyModifierMask.MaskCtrl | Key.B);
|
||||
|
||||
_toolBarBuildButton.Pressed += BuildProjectPressed;
|
||||
AddControlToContainer(CustomControlContainer.Toolbar, _toolBarBuildButton);
|
||||
Internal.EditorPlugin_AddControlToEditorRunBar(_toolBarBuildButton);
|
||||
// Move Build button so it appears to the left of the Play button.
|
||||
_toolBarBuildButton.GetParent().MoveChild(_toolBarBuildButton, 0);
|
||||
|
||||
if (File.Exists(GodotSharpDirs.ProjectCsProjPath))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,11 +29,26 @@ namespace GodotTools.Internals
|
|||
return Variant.CreateTakingOwnershipOfDisposableValue(result);
|
||||
}
|
||||
|
||||
public static Variant EditorShortcut(string setting)
|
||||
public static Shortcut EditorDefShortcut(string setting, string name, Key keycode = Key.None, bool physical = false)
|
||||
{
|
||||
using godot_string settingIn = Marshaling.ConvertStringToNative(setting);
|
||||
Internal.godot_icall_Globals_EditorShortcut(settingIn, out godot_variant result);
|
||||
return Variant.CreateTakingOwnershipOfDisposableValue(result);
|
||||
using godot_string nameIn = Marshaling.ConvertStringToNative(name);
|
||||
Internal.godot_icall_Globals_EditorDefShortcut(settingIn, nameIn, keycode, physical.ToGodotBool(), out godot_variant result);
|
||||
return (Shortcut)Variant.CreateTakingOwnershipOfDisposableValue(result);
|
||||
}
|
||||
|
||||
public static Shortcut EditorGetShortcut(string setting)
|
||||
{
|
||||
using godot_string settingIn = Marshaling.ConvertStringToNative(setting);
|
||||
Internal.godot_icall_Globals_EditorGetShortcut(settingIn, out godot_variant result);
|
||||
return (Shortcut)Variant.CreateTakingOwnershipOfDisposableValue(result);
|
||||
}
|
||||
|
||||
public static void EditorShortcutOverride(string setting, string feature, Key keycode = Key.None, bool physical = false)
|
||||
{
|
||||
using godot_string settingIn = Marshaling.ConvertStringToNative(setting);
|
||||
using godot_string featureIn = Marshaling.ConvertStringToNative(feature);
|
||||
Internal.godot_icall_Globals_EditorShortcutOverride(settingIn, featureIn, keycode, physical.ToGodotBool());
|
||||
}
|
||||
|
||||
[SuppressMessage("ReSharper", "InconsistentNaming")]
|
||||
|
|
|
|||
|
|
@ -54,6 +54,9 @@ namespace GodotTools.Internals
|
|||
|
||||
public static void EditorRunStop() => godot_icall_Internal_EditorRunStop();
|
||||
|
||||
public static void EditorPlugin_AddControlToEditorRunBar(Control control) =>
|
||||
godot_icall_Internal_EditorPlugin_AddControlToEditorRunBar(control.NativeInstance);
|
||||
|
||||
public static void ScriptEditorDebugger_ReloadScripts() =>
|
||||
godot_icall_Internal_ScriptEditorDebugger_ReloadScripts();
|
||||
|
||||
|
|
@ -137,6 +140,8 @@ namespace GodotTools.Internals
|
|||
|
||||
private static partial void godot_icall_Internal_EditorRunStop();
|
||||
|
||||
private static partial void godot_icall_Internal_EditorPlugin_AddControlToEditorRunBar(IntPtr p_control);
|
||||
|
||||
private static partial void godot_icall_Internal_ScriptEditorDebugger_ReloadScripts();
|
||||
|
||||
private static partial void godot_icall_Internal_CodeCompletionRequest(int kind, in godot_string scriptFile,
|
||||
|
|
@ -151,7 +156,13 @@ namespace GodotTools.Internals
|
|||
bool restartIfChanged, out godot_variant result);
|
||||
|
||||
public static partial void
|
||||
godot_icall_Globals_EditorShortcut(in godot_string setting, out godot_variant result);
|
||||
godot_icall_Globals_EditorDefShortcut(in godot_string setting, in godot_string name, Key keycode, godot_bool physical, out godot_variant result);
|
||||
|
||||
public static partial void
|
||||
godot_icall_Globals_EditorGetShortcut(in godot_string setting, out godot_variant result);
|
||||
|
||||
public static partial void
|
||||
godot_icall_Globals_EditorShortcutOverride(in godot_string setting, in godot_string feature, Key keycode, godot_bool physical);
|
||||
|
||||
public static partial void godot_icall_Globals_TTR(in godot_string text, out godot_string dest);
|
||||
|
||||
|
|
|
|||
|
|
@ -168,6 +168,10 @@ void godot_icall_Internal_EditorRunStop() {
|
|||
EditorRunBar::get_singleton()->stop_playing();
|
||||
}
|
||||
|
||||
void godot_icall_Internal_EditorPlugin_AddControlToEditorRunBar(Control *p_control) {
|
||||
EditorRunBar::get_singleton()->get_buttons_container()->add_child(p_control);
|
||||
}
|
||||
|
||||
void godot_icall_Internal_ScriptEditorDebugger_ReloadScripts() {
|
||||
EditorDebuggerNode *ed = EditorDebuggerNode::get_singleton();
|
||||
if (ed) {
|
||||
|
|
@ -199,12 +203,25 @@ void godot_icall_Globals_EditorDef(const godot_string *p_setting, const godot_va
|
|||
memnew_placement(r_result, Variant(result));
|
||||
}
|
||||
|
||||
void godot_icall_Globals_EditorShortcut(const godot_string *p_setting, godot_variant *r_result) {
|
||||
void godot_icall_Globals_EditorDefShortcut(const godot_string *p_setting, const godot_string *p_name, Key p_keycode, bool p_physical, godot_variant *r_result) {
|
||||
String setting = *reinterpret_cast<const String *>(p_setting);
|
||||
String name = *reinterpret_cast<const String *>(p_name);
|
||||
Ref<Shortcut> result = ED_SHORTCUT(setting, name, p_keycode, p_physical);
|
||||
memnew_placement(r_result, Variant(result));
|
||||
}
|
||||
|
||||
void godot_icall_Globals_EditorGetShortcut(const godot_string *p_setting, Ref<Shortcut> *r_result) {
|
||||
String setting = *reinterpret_cast<const String *>(p_setting);
|
||||
Ref<Shortcut> result = ED_GET_SHORTCUT(setting);
|
||||
memnew_placement(r_result, Variant(result));
|
||||
}
|
||||
|
||||
void godot_icall_Globals_EditorShortcutOverride(const godot_string *p_setting, const godot_string *p_feature, Key p_keycode, bool p_physical) {
|
||||
String setting = *reinterpret_cast<const String *>(p_setting);
|
||||
String feature = *reinterpret_cast<const String *>(p_feature);
|
||||
ED_SHORTCUT_OVERRIDE(setting, feature, p_keycode, p_physical);
|
||||
}
|
||||
|
||||
void godot_icall_Globals_TTR(const godot_string *p_text, godot_string *r_dest) {
|
||||
String text = *reinterpret_cast<const String *>(p_text);
|
||||
memnew_placement(r_dest, String(TTR(text)));
|
||||
|
|
@ -251,12 +268,15 @@ static const void *unmanaged_callbacks[]{
|
|||
(void *)godot_icall_Internal_EditorNodeShowScriptScreen,
|
||||
(void *)godot_icall_Internal_EditorRunPlay,
|
||||
(void *)godot_icall_Internal_EditorRunStop,
|
||||
(void *)godot_icall_Internal_EditorPlugin_AddControlToEditorRunBar,
|
||||
(void *)godot_icall_Internal_ScriptEditorDebugger_ReloadScripts,
|
||||
(void *)godot_icall_Internal_CodeCompletionRequest,
|
||||
(void *)godot_icall_Globals_EditorScale,
|
||||
(void *)godot_icall_Globals_GlobalDef,
|
||||
(void *)godot_icall_Globals_EditorDef,
|
||||
(void *)godot_icall_Globals_EditorShortcut,
|
||||
(void *)godot_icall_Globals_EditorDefShortcut,
|
||||
(void *)godot_icall_Globals_EditorGetShortcut,
|
||||
(void *)godot_icall_Globals_EditorShortcutOverride,
|
||||
(void *)godot_icall_Globals_TTR,
|
||||
(void *)godot_icall_Utils_OS_GetPlatformName,
|
||||
(void *)godot_icall_Utils_OS_UnixFileHasExecutableAccess,
|
||||
|
|
|
|||
1
modules/mono/icons/BuildCSharp.svg
Normal file
1
modules/mono/icons/BuildCSharp.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M 9.6060193,0.78346667 C 8.6741914,0.96303367 7.6708299,1.5334576 6.9028943,1.9768256 l -2.1523438,1.244141 0.082031,0.138672 -0.3105469,-0.00781 -2.5839844,1.492188 1.9101563,3.308593 2.5820312,-1.490234 0.1425781,-0.255859 4.1875002,7.2539054 0.5,0.867187 c 0.415803,0.720194 1.331398,0.964165 2.050782,0.548829 0.719286,-0.415279 0.963839,-1.33001 0.548828,-2.048829 l -2,-3.4648424 -2.8808602,-4.990235 3.7070322,-2.101562 -0.265626,-0.439453 C 11.697382,0.83561667 10.650124,0.58226267 9.6060193,0.78346667 Z" fill="#e0e0e0"/></svg>
|
||||
|
After Width: | Height: | Size: 630 B |
Loading…
Reference in a new issue