Skip to content

Commit 22f06ac

Browse files
PaperPrototypePaperPrototype
committed
Replace EditorTheme.Text with EditorTheme.Ink500
1 parent 9d3b36d commit 22f06ac

23 files changed

Lines changed: 137 additions & 137 deletions

‎Prowl.Editor/DragDrop.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public static void DrawVisual(Paper paper)
139139
.IsNotInteractable()
140140
.Layer(Layer.Topmost)
141141
.Text($"{Payload.Icon} {Payload.DisplayName}", font)
142-
.TextColor(EditorTheme.Text)
142+
.TextColor(EditorTheme.Ink500)
143143
.FontSize(EditorTheme.FontSize - 2)
144144
.Alignment(TextAlignment.MiddleLeft);
145145
}

‎Prowl.Editor/EditorApplication.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private void DrawTitleFlap(Paper paper, int w, int h)
248248
.Position(w - 130, 0).Size(120, EditorTheme.MenuBarHeight)
249249
.IsNotInteractable()
250250
.Text($"Prowl v{version}", font)
251-
.TextColor(EditorTheme.TextDim)
251+
.TextColor(EditorTheme.Ink500Dim)
252252
.FontSize(EditorTheme.FontSize - 2)
253253
.Alignment(TextAlignment.MiddleRight);
254254

@@ -340,7 +340,7 @@ private void DrawTitleFlap(Paper paper, int w, int h)
340340
.Position(bx, flapContentY).Size(projW, EditorTheme.MenuBarHeight)
341341
.IsNotInteractable()
342342
.Text(projectText, font)
343-
.TextColor(EditorTheme.Text)
343+
.TextColor(EditorTheme.Ink500)
344344
.FontSize(EditorTheme.FontSize)
345345
.Alignment(TextAlignment.MiddleCenter);
346346

@@ -362,7 +362,7 @@ private void DrawTitleFlap(Paper paper, int w, int h)
362362
.Rounded(4)
363363
.BackgroundColor(Application.IsPlaying ? System.Drawing.Color.FromArgb(255, 60, 160, 60) : System.Drawing.Color.Transparent)
364364
.Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End()
365-
.Text(EditorIcons.Play, font).TextColor(EditorTheme.Text).FontSize(14f)
365+
.Text(EditorIcons.Play, font).TextColor(EditorTheme.Ink500).FontSize(14f)
366366
.Alignment(TextAlignment.MiddleCenter)
367367
.OnClick(0, (_, e) => Application.IsPlaying = !Application.IsPlaying);
368368

@@ -375,7 +375,7 @@ private void DrawTitleFlap(Paper paper, int w, int h)
375375
.Rounded(4)
376376
.BackgroundColor(System.Drawing.Color.Transparent)
377377
.Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End()
378-
.Text(EditorIcons.Pause, font).TextColor(EditorTheme.Text).FontSize(14f)
378+
.Text(EditorIcons.Pause, font).TextColor(EditorTheme.Ink500).FontSize(14f)
379379
.Alignment(TextAlignment.MiddleCenter);
380380

381381
bx += btnSize + 4f;
@@ -387,7 +387,7 @@ private void DrawTitleFlap(Paper paper, int w, int h)
387387
.Rounded(4)
388388
.BackgroundColor(System.Drawing.Color.Transparent)
389389
.Hovered.BackgroundColor(System.Drawing.Color.FromArgb(80, 255, 255, 255)).End()
390-
.Text(EditorIcons.ForwardStep, font).TextColor(EditorTheme.Text).FontSize(14f)
390+
.Text(EditorIcons.ForwardStep, font).TextColor(EditorTheme.Ink500).FontSize(14f)
391391
.Alignment(TextAlignment.MiddleCenter);
392392

393393
bx += btnSize + 8f;
@@ -407,7 +407,7 @@ private void DrawTitleFlap(Paper paper, int w, int h)
407407
.Position(bx, flapContentY).Size(fpsW, EditorTheme.MenuBarHeight)
408408
.IsNotInteractable()
409409
.Text(fpsText, font)
410-
.TextColor(EditorTheme.Text)
410+
.TextColor(EditorTheme.Ink500)
411411
.FontSize(EditorTheme.FontSize)
412412
.Alignment(TextAlignment.MiddleCenter);
413413
}

‎Prowl.Editor/EditorTheme.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ public static class EditorTheme
4242
// public static Color MenuBarBackground => Darkest;
4343
// public static Color WindowBackground => Normal;
4444
// public static Color PanelBackground => Normal;
45-
public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33);
46-
public static Color InputBackground = Color.FromArgb(255, 28, 28, 30);
45+
// public static Color HeaderBackground = Color.FromArgb(255, 30, 30, 33);
46+
// public static Color InputBackground = Color.FromArgb(255, 28, 28, 30);
4747
// public static Color Border => Bright;
4848

4949
// Text
50-
public static Color Text = Color.FromArgb(255, 220, 220, 220);
51-
public static Color TextDim = Color.FromArgb(255, 150, 150, 150);
52-
public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90);
50+
// public static Color Text = Color.FromArgb(255, 220, 220, 220);
51+
// public static Color TextDim = Color.FromArgb(255, 150, 150, 150);
52+
// public static Color TextDisabled = Color.FromArgb(255, 90, 90, 90);
5353

5454
// Interactive
5555
public static Color ButtonNormal = Color.FromArgb(255, 55, 55, 58);

‎Prowl.Editor/Inspector/AddComponentPopup.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ public static void Draw(Paper paper)
7979
{
8080
paper.Box("acp_title").Height(32)
8181
.Text("Add Component", font)
82-
.TextColor(EditorTheme.Text)
82+
.TextColor(EditorTheme.Ink500)
8383
.FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft);
8484

8585
paper.Box("acp_spacer");
8686

8787
paper.Box("acp_close")
8888
.Width(24).Height(24).Rounded(4)
8989
.Hovered.BackgroundColor(Color.FromArgb(255, 180, 60, 60)).End()
90-
.Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim)
90+
.Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink500Dim)
9191
.FontSize(12f).Alignment(TextAlignment.MiddleCenter)
9292
.OnClick(0, (_, _) => Close());
9393
}
@@ -120,7 +120,7 @@ public static void Draw(Paper paper)
120120
{
121121
paper.Box("acp_empty").Height(40)
122122
.Text("No matching components", font)
123-
.TextColor(EditorTheme.TextDisabled)
123+
.TextColor(EditorTheme.Ink500Disabled)
124124
.FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter);
125125
}
126126

@@ -146,7 +146,7 @@ public static void Draw(Paper paper)
146146
paper.Box($"acp_cat_{category.GetHashCode()}")
147147
.Height(20).ChildLeft(8)
148148
.Text(category, font)
149-
.TextColor(EditorTheme.TextDim)
149+
.TextColor(EditorTheme.Ink500Dim)
150150
.FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleLeft);
151151

152152
foreach (var comp in group.OrderBy(c => c.Name))
@@ -183,13 +183,13 @@ private static void DrawComponentItem(Paper paper, Prowl.Scribe.FontFile font, s
183183
// Icon
184184
paper.Box($"{id}_ico")
185185
.Width(16).Height(EditorTheme.RowHeight)
186-
.Text(comp.Icon, font).TextColor(EditorTheme.TextDim)
186+
.Text(comp.Icon, font).TextColor(EditorTheme.Ink500Dim)
187187
.FontSize(11f).Alignment(TextAlignment.MiddleCenter);
188188

189189
// Name
190190
paper.Box($"{id}_name")
191191
.Height(EditorTheme.RowHeight)
192-
.Text(comp.Name, font).TextColor(EditorTheme.Text)
192+
.Text(comp.Name, font).TextColor(EditorTheme.Ink500)
193193
.FontSize(EditorTheme.FontSize - 1).Alignment(TextAlignment.MiddleLeft);
194194
}
195195
}

‎Prowl.Editor/Inspector/EngineObjectPropertyEditor.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public override void OnGUI(Paper paper, string id, string label, object? value,
4444
if (!string.IsNullOrEmpty(label))
4545
paper.Box($"{id}_lbl")
4646
.Width(EditorTheme.LabelWidth).Height(EditorTheme.RowHeight).ChildLeft(4)
47-
.Text(label, font).TextColor(EditorTheme.Text)
47+
.Text(label, font).TextColor(EditorTheme.Ink500)
4848
.FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft);
4949

5050
// Check if a compatible asset is being dragged over this field
@@ -86,21 +86,21 @@ public override void OnGUI(Paper paper, string id, string label, object? value,
8686
.Width(16).Height(EditorTheme.RowHeight)
8787
.IsNotInteractable()
8888
.Text(icon, font)
89-
.TextColor(eo != null ? EditorTheme.Accent : EditorTheme.TextDisabled)
89+
.TextColor(eo != null ? EditorTheme.Accent : EditorTheme.Ink500Disabled)
9090
.FontSize(10f).Alignment(TextAlignment.MiddleCenter);
9191

9292
// Name
9393
paper.Box($"{id}_name")
9494
.Height(EditorTheme.RowHeight).Clip()
9595
.IsNotInteractable()
9696
.Text(displayName, font)
97-
.TextColor(eo != null ? EditorTheme.Text : EditorTheme.TextDisabled)
97+
.TextColor(eo != null ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled)
9898
.FontSize(EditorTheme.FontSize - 1).Alignment(TextAlignment.MiddleLeft);
9999

100100
// Picker circle button
101101
paper.Box($"{id}_pick")
102102
.Width(20).Height(EditorTheme.RowHeight)
103-
.Text(EditorIcons.CircleDot, font).TextColor(EditorTheme.TextDim)
103+
.Text(EditorIcons.CircleDot, font).TextColor(EditorTheme.Ink500Dim)
104104
.FontSize(12f).Alignment(TextAlignment.MiddleCenter)
105105
.Hovered.BackgroundColor(EditorTheme.Accent).End()
106106
.Rounded(3)
@@ -162,15 +162,15 @@ public static void DrawSelectorModal(Paper paper)
162162
{
163163
paper.Box("eo_sel_title").Height(32)
164164
.Text($"Select {_selectorType.Name}", font)
165-
.TextColor(EditorTheme.Text)
165+
.TextColor(EditorTheme.Ink500)
166166
.FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft);
167167

168168
paper.Box("eo_sel_spacer");
169169

170170
paper.Box("eo_sel_close")
171171
.Width(24).Height(24).Rounded(4)
172172
.Hovered.BackgroundColor(Color.FromArgb(255, 180, 60, 60)).End()
173-
.Text(EditorIcons.Xmark, font).TextColor(EditorTheme.TextDim)
173+
.Text(EditorIcons.Xmark, font).TextColor(EditorTheme.Ink500Dim)
174174
.FontSize(12f).Alignment(TextAlignment.MiddleCenter)
175175
.OnClick(0, (_, _) => _selectorOpen = false);
176176
}
@@ -184,7 +184,7 @@ public static void DrawSelectorModal(Paper paper)
184184
.Hovered.BackgroundColor(EditorTheme.Accent).End()
185185
.Rounded(3)
186186
.Text("None", font)
187-
.TextColor(EditorTheme.TextDim)
187+
.TextColor(EditorTheme.Ink500Dim)
188188
.FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft)
189189
.OnClick(0, (_, _) =>
190190
{
@@ -201,7 +201,7 @@ public static void DrawSelectorModal(Paper paper)
201201
{
202202
paper.Box("eo_sel_bi_hdr").Height(EditorTheme.RowHeight).ChildLeft(6)
203203
.Text($"{EditorIcons.Cube} Built-In", font)
204-
.TextColor(EditorTheme.TextDim)
204+
.TextColor(EditorTheme.Ink500Dim)
205205
.FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft);
206206

207207
for (int i = 0; i < builtInItems.Count; i++)
@@ -219,7 +219,7 @@ public static void DrawSelectorModal(Paper paper)
219219

220220
paper.Box("eo_sel_proj_hdr").Height(EditorTheme.RowHeight).ChildLeft(6)
221221
.Text($"{EditorIcons.FolderOpen} Project", font)
222-
.TextColor(EditorTheme.TextDim)
222+
.TextColor(EditorTheme.Ink500Dim)
223223
.FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleLeft);
224224

225225
for (int i = 0; i < projectItems.Count; i++)
@@ -234,7 +234,7 @@ public static void DrawSelectorModal(Paper paper)
234234
{
235235
paper.Box("eo_sel_empty").Height(40)
236236
.Text("No assets of this type found", font)
237-
.TextColor(EditorTheme.TextDisabled)
237+
.TextColor(EditorTheme.Ink500Disabled)
238238
.FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleCenter);
239239
}
240240
}
@@ -257,17 +257,17 @@ private static void DrawSelectorItem(Paper paper, Prowl.Scribe.FontFile font, st
257257
{
258258
paper.Box($"{id}_ico")
259259
.Width(14).Height(EditorTheme.RowHeight)
260-
.Text(icon, font).TextColor(EditorTheme.TextDim)
260+
.Text(icon, font).TextColor(EditorTheme.Ink500Dim)
261261
.FontSize(9f).Alignment(TextAlignment.MiddleCenter);
262262

263263
paper.Box($"{id}_name")
264264
.Height(EditorTheme.RowHeight).Clip()
265-
.Text(name, font).TextColor(EditorTheme.Text)
265+
.Text(name, font).TextColor(EditorTheme.Ink500)
266266
.FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft);
267267

268268
paper.Box($"{id}_path")
269269
.Width(UnitValue.Auto).Height(EditorTheme.RowHeight).ChildRight(4)
270-
.Text($"({pathLabel})", font).TextColor(EditorTheme.TextDisabled)
270+
.Text($"({pathLabel})", font).TextColor(EditorTheme.Ink500Disabled)
271271
.FontSize(EditorTheme.FontSize - 4).Alignment(TextAlignment.MiddleRight);
272272
}
273273
}

‎Prowl.Editor/Inspector/GameObjectInspector.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ private static void DrawHeader(Paper paper, Prowl.Scribe.FontFile font, GameObje
6161
.Enter())
6262
{
6363
paper.Box("gi_tag_lbl").Width(30).Height(22)
64-
.Text("Tag", font).TextColor(EditorTheme.TextDim)
64+
.Text("Tag", font).TextColor(EditorTheme.Ink500Dim)
6565
.FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleRight);
6666

6767
EditorGUI.TextField(paper, "gi_tag", "", go.Tag)
6868
.OnValueChanged(v => go.Tag = v);
6969

7070
paper.Box("gi_layer_lbl").Width(36).Height(22)
71-
.Text("Layer", font).TextColor(EditorTheme.TextDim)
71+
.Text("Layer", font).TextColor(EditorTheme.Ink500Dim)
7272
.FontSize(EditorTheme.FontSize - 2).Alignment(TextAlignment.MiddleRight);
7373

7474
EditorGUI.TextField(paper, "gi_layer", "", go.Layer)
@@ -150,7 +150,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game
150150
paper.Box($"{compId}_label")
151151
.Height(24)
152152
.Text($"{icon} {compName}", font)
153-
.TextColor(comp.Enabled ? EditorTheme.Text : EditorTheme.TextDisabled)
153+
.TextColor(comp.Enabled ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled)
154154
.FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleLeft);
155155

156156
// Spacer
@@ -160,7 +160,7 @@ private static void DrawComponents(Paper paper, Prowl.Scribe.FontFile font, Game
160160
using (paper.Box($"{compId}_gear")
161161
.Width(20).Height(24).Rounded(3)
162162
.Hovered.BackgroundColor(EditorTheme.ButtonHovered).End()
163-
.Text(EditorIcons.EllipsisVertical, font).TextColor(EditorTheme.TextDim)
163+
.Text(EditorIcons.EllipsisVertical, font).TextColor(EditorTheme.Ink500Dim)
164164
.FontSize(11f).Alignment(TextAlignment.MiddleCenter)
165165
.Enter())
166166
{
@@ -252,7 +252,7 @@ private static void DrawAddComponentButton(Paper paper, Prowl.Scribe.FontFile fo
252252
.BackgroundColor(EditorTheme.ButtonNormal)
253253
.Hovered.BackgroundColor(EditorTheme.ButtonHovered).End()
254254
.Text($"{EditorIcons.Plus} Add Component", font)
255-
.TextColor(EditorTheme.Text)
255+
.TextColor(EditorTheme.Ink500)
256256
.FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter)
257257
.OnClick(go, (g, _) => AddComponentPopup.Open(g));
258258
}

‎Prowl.Editor/MainMenuBar.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static void Draw(Paper paper)
3838
.Width(UnitValue.Auto)
3939
.Hovered.BackgroundColor(EditorTheme.ButtonHovered).End()
4040
.Text(item.Label, font)
41-
.TextColor(EditorTheme.Text)
41+
.TextColor(EditorTheme.Ink500)
4242
.Alignment(TextAlignment.MiddleCenter)
4343
.FontSize(EditorTheme.FontSize)
4444
.Enter())
@@ -85,7 +85,7 @@ private static void RenderDropdown(Paper paper, string id, List<MenuItem> items,
8585
continue;
8686
}
8787

88-
var textColor = item.IsEnabled ? EditorTheme.Text : EditorTheme.TextDisabled;
88+
var textColor = item.IsEnabled ? EditorTheme.Ink500 : EditorTheme.Ink500Disabled;
8989

9090
// Menu item row — submenu is a child so IsParentHovered keeps it open
9191
using (paper.Row($"{id}_i_{index}")

‎Prowl.Editor/Panels/GameViewPanel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private void DrawToolbar(Paper paper, Prowl.Scribe.FontFile font, float width)
7171
paper.Box("gv_cam_count")
7272
.Width(UnitValue.Auto).Height(22).ChildLeft(4).ChildRight(4)
7373
.Text($"{EditorIcons.Camera} {camCount} camera(s)", font)
74-
.TextColor(EditorTheme.TextDim)
74+
.TextColor(EditorTheme.Ink500Dim)
7575
.FontSize(EditorTheme.FontSize - 3).Alignment(TextAlignment.MiddleRight);
7676
}
7777
}
@@ -86,7 +86,7 @@ private void DrawGameView(Paper paper, Prowl.Scribe.FontFile font, float width,
8686
.Size(width, height)
8787
.BackgroundColor(Color.FromArgb(255, 20, 20, 22))
8888
.Text("No scene loaded", font)
89-
.TextColor(EditorTheme.TextDisabled)
89+
.TextColor(EditorTheme.Ink500Disabled)
9090
.FontSize(EditorTheme.FontSize).Alignment(TextAlignment.MiddleCenter);
9191
return;
9292
}

0 commit comments

Comments
 (0)