Relintai/mono
1
0
Fork 0
mirror of https://github.com/Relintai/mono.git synced 2024-11-08 10:12:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the remaining issues.

Browse Source
This commit is contained in:
Relintai 2023-06-01 17:18:30 +02:00
parent 390381fff0
commit ba70b47fc1
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/GodotTools/GodotTools/Build/BuildOutputView.cs
View File

@ -41,13 +41,13 @@ namespace GodotTools.Build
get get
{ {
if (!HasBuildExited) if (!HasBuildExited)
return GetIcon("Stop", "EditorIcons"); return GetThemeIcon("Stop", "EditorIcons");
if (BuildResult == Build.BuildResult.Error) if (BuildResult == Build.BuildResult.Error)
return GetIcon("Error", "EditorIcons"); return GetThemeIcon("Error", "EditorIcons");
if (WarningCount > 1) if (WarningCount > 1)
return GetIcon("Warning", "EditorIcons"); return GetThemeIcon("Warning", "EditorIcons");
return null; return null;
} }
@ -156,8 +156,8 @@ namespace GodotTools.Build
{ {
_issuesList.Clear(); _issuesList.Clear();
using (var warningIcon = GetIcon("Warning", "EditorIcons")) using (var warningIcon = GetThemeIcon("Warning", "EditorIcons"))
using (var errorIcon = GetIcon("Error", "EditorIcons")) using (var errorIcon = GetThemeIcon("Error", "EditorIcons"))
{ {
for (int i = 0; i < _issues.Count; i++) for (int i = 0; i < _issues.Count; i++)
{ {
@ -345,7 +345,7 @@ namespace GodotTools.Build
if (_issuesList.IsAnythingSelected()) if (_issuesList.IsAnythingSelected())
{ {
// Add menu entries for the selected item // Add menu entries for the selected item
_issuesListContextMenu.AddIconItem(GetIcon("ActionCopy", "EditorIcons"), _issuesListContextMenu.AddIconItem(GetThemeIcon("ActionCopy", "EditorIcons"),
label: "Copy Error".TTR(), (int)IssuesContextMenuOption.Copy); label: "Copy Error".TTR(), (int)IssuesContextMenuOption.Copy);
} }

12
editor/GodotTools/GodotTools/Build/MSBuildPanel.cs
View File

@ -116,7 +116,7 @@ namespace GodotTools.Build
var toolBarHBox = new HBoxContainer { SizeFlagsHorizontal = (int)SizeFlags.ExpandFill }; var toolBarHBox = new HBoxContainer { SizeFlagsHorizontal = (int)SizeFlags.ExpandFill };
AddChild(toolBarHBox); AddChild(toolBarHBox);
_buildMenuBtn = new MenuButton { Text = "Build", Icon = GetIcon("Play", "EditorIcons") }; _buildMenuBtn = new MenuButton { Text = "Build", Icon = GetThemeIcon("Play", "EditorIcons") };
toolBarHBox.AddChild(_buildMenuBtn); toolBarHBox.AddChild(_buildMenuBtn);
var buildMenu = _buildMenuBtn.GetPopup(); var buildMenu = _buildMenuBtn.GetPopup();
@ -128,7 +128,7 @@ namespace GodotTools.Build
_errorsBtn = new Button _errorsBtn = new Button
{ {
HintTooltip = "Show Errors".TTR(), HintTooltip = "Show Errors".TTR(),
Icon = GetIcon("StatusError", "EditorIcons"), Icon = GetThemeIcon("StatusError", "EditorIcons"),
ExpandIcon = false, ExpandIcon = false,
ToggleMode = true, ToggleMode = true,
Pressed = true, Pressed = true,
@ -140,7 +140,7 @@ namespace GodotTools.Build
_warningsBtn = new Button _warningsBtn = new Button
{ {
HintTooltip = "Show Warnings".TTR(), HintTooltip = "Show Warnings".TTR(),
Icon = GetIcon("NodeWarning", "EditorIcons"), Icon = GetThemeIcon("NodeWarning", "EditorIcons"),
ExpandIcon = false, ExpandIcon = false,
ToggleMode = true, ToggleMode = true,
Pressed = true, Pressed = true,
@ -170,11 +170,11 @@ namespace GodotTools.Build
if (what == NotificationThemeChanged) if (what == NotificationThemeChanged)
{ {
if (_buildMenuBtn != null) if (_buildMenuBtn != null)
_buildMenuBtn.Icon = GetIcon("Play", "EditorIcons"); _buildMenuBtn.Icon = GetThemeIcon("Play", "EditorIcons");
if (_errorsBtn != null) if (_errorsBtn != null)
_errorsBtn.Icon = GetIcon("StatusError", "EditorIcons"); _errorsBtn.Icon = GetThemeIcon("StatusError", "EditorIcons");
if (_warningsBtn != null) if (_warningsBtn != null)
_warningsBtn.Icon = GetIcon("NodeWarning", "EditorIcons"); _warningsBtn.Icon = GetThemeIcon("NodeWarning", "EditorIcons");
} }
} }
} }

8
glue/GodotSharp/GodotSharp/Core/Projection.cs
View File

@ -41,10 +41,10 @@ namespace Godot
public static Projection Identity { get { return _identity; } } public static Projection Identity { get { return _identity; } }
public void set_identity() { public void set_identity() {
Row0[0] = 1; Row0.x = 1;
Row1[1] = 1; Row1.y = 1;
Row2[2] = 1; Row2.z = 1;
Row3[3] = 1; Row3.w = 1;
} }
public Projection(Vector4 Row0, Vector4 Row1, Vector4 Row2, Vector4 Row3) { public Projection(Vector4 Row0, Vector4 Row1, Vector4 Row2, Vector4 Row3) {

6
glue/GodotSharp/GodotSharp/Core/Rect2i.cs
View File

@ -57,7 +57,7 @@ namespace Godot
/// <param name="position">The position.</param> /// <param name="position">The position.</param>
/// <param name="width">The width.</param> /// <param name="width">The width.</param>
/// <param name="height">The height.</param> /// <param name="height">The height.</param>
public Rect2i(Vector2i position, real_t width, real_t height) public Rect2i(Vector2i position, int width, int height)
{ {
_position = position; _position = position;
_size = new Vector2i(width, height); _size = new Vector2i(width, height);
@ -69,7 +69,7 @@ namespace Godot
/// <param name="x">The position's X coordinate.</param> /// <param name="x">The position's X coordinate.</param>
/// <param name="y">The position's Y coordinate.</param> /// <param name="y">The position's Y coordinate.</param>
/// <param name="size">The size.</param> /// <param name="size">The size.</param>
public Rect2i(real_t x, real_t y, Vector2i size) public Rect2i(int x, int y, Vector2i size)
{ {
_position = new Vector2i(x, y); _position = new Vector2i(x, y);
_size = size; _size = size;
@ -82,7 +82,7 @@ namespace Godot
/// <param name="y">The position's Y coordinate.</param> /// <param name="y">The position's Y coordinate.</param>
/// <param name="width">The width.</param> /// <param name="width">The width.</param>
/// <param name="height">The height.</param> /// <param name="height">The height.</param>
public Rect2i(real_t x, real_t y, real_t width, real_t height) public Rect2i(int x, int y, int width, int height)
{ {
_position = new Vector2i(x, y); _position = new Vector2i(x, y);
_size = new Vector2i(width, height); _size = new Vector2i(width, height);

6
glue/GodotSharp/GodotSharp/Core/StringName.cs
View File

@ -62,7 +62,7 @@ namespace Godot
} }
public StringName() { public StringName() {
ptr = godot_icall_StringName_Ctor(path); ptr = godot_icall_StringName_Ctor();
} }
public StringName(string path) public StringName(string path)
@ -91,7 +91,7 @@ namespace Godot
public static bool operator ==(StringName left, StringName right) public static bool operator ==(StringName left, StringName right)
{ {
return godot_icall_StringName_operator_String(StringName.GetPtr(left), StringName.GetPtr(right)); return godot_icall_StringName_operator_Equals(StringName.GetPtr(left), StringName.GetPtr(right));
} }
public static bool operator !=(StringName left, StringName right) public static bool operator !=(StringName left, StringName right)
@ -111,7 +111,7 @@ namespace Godot
public bool Equals(StringName other) public bool Equals(StringName other)
{ {
return godot_icall_StringName_operator_String(StringName.GetPtr(left), StringName.GetPtr(right)); return godot_icall_StringName_operator_Equals(StringName.GetPtr(this), StringName.GetPtr(other));
} }
public override int GetHashCode() public override int GetHashCode()