Skip to content

Commit c91dc2d

Browse files
committed
New UI darker and more suitable for the game
1 parent a4a2e06 commit c91dc2d

16 files changed

+30
-20
lines changed

ValheimTooler/Core/ItemGiver.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ public static void ItemGiverWindow(int windowID)
7373
if (ObjectDB.instance == null || ObjectDB.instance.m_items.Count == 0)
7474
return;
7575

76+
GUIStyle labelStyle = new GUIStyle(GUI.skin.label);
77+
78+
labelStyle.normal.textColor = Color.white;
79+
7680
GUILayout.Space(EntryPoint.s_boxSpacing);
7781
s_searchTerms = GUILayout.TextField(s_searchTerms);
7882

@@ -86,14 +90,14 @@ public static void ItemGiverWindow(int windowID)
8690

8791
GUILayout.BeginHorizontal();
8892
{
89-
GUILayout.Label(VTLocalization.instance.Localize("$vt_item_giver_quantity :"), GUILayout.ExpandWidth(false));
93+
GUILayout.Label(VTLocalization.instance.Localize("$vt_item_giver_quantity :"), labelStyle, GUILayout.ExpandWidth(false));
9094
s_quantityItem = GUILayout.TextField(s_quantityItem, GUILayout.ExpandWidth(true));
9195
}
9296
GUILayout.EndHorizontal();
9397

9498
GUILayout.BeginHorizontal();
9599
{
96-
GUILayout.Label(VTLocalization.instance.Localize("$vt_item_giver_quality :"), GUILayout.ExpandWidth(false));
100+
GUILayout.Label(VTLocalization.instance.Localize("$vt_item_giver_quality :"), labelStyle, GUILayout.ExpandWidth(false));
97101
s_qualityItem = GUILayout.TextField(s_qualityItem, GUILayout.ExpandWidth(true));
98102
}
99103
GUILayout.EndHorizontal();

ValheimTooler/Resources/box.png

150 Bytes
Loading
28 Bytes
Loading
-31 Bytes
Loading
27 Bytes
Loading
44 Bytes
Loading
61 Bytes
Loading
105 Bytes
Loading

ValheimTooler/Resources/field.png

-156 Bytes
Loading
-33 Bytes
Loading
455 Bytes
Loading

ValheimTooler/Resources/toggle_on.png

286 Bytes
Loading

ValheimTooler/Resources/window.png

41 Bytes
Loading
-123 Bytes
Loading

ValheimTooler/UI/InterfaceMaker.cs

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,22 @@ private static GUISkin CreateSkin()
7474
guiskin.box.onNormal.background = null;
7575
guiskin.box.normal.background = InterfaceMaker.s_boxBackground;
7676
guiskin.box.normal.textColor = Color.gray;
77+
guiskin.box.padding.top += 7;
78+
guiskin.box.padding.bottom += 7;
79+
guiskin.box.padding.left += 7;
80+
guiskin.box.padding.right += 7;
7781

7882
guiskin.window.border = new RectOffset(80, 80, 80, 20);
7983
guiskin.window.padding.top += 5;
8084
guiskin.window.onNormal.background = null;
8185
guiskin.window.normal.background = InterfaceMaker.s_winTitleBackground;
8286
guiskin.window.normal.textColor = Color.white;
8387

84-
guiskin.button.normal.textColor = Color.gray;
88+
guiskin.button.normal.textColor = Color.white;
8589
guiskin.button.normal.background = s_buttonNormalBackground;
86-
guiskin.button.hover.textColor = Color.gray;
90+
guiskin.button.hover.textColor = Color.white;
8791
guiskin.button.hover.background = s_buttonHoverBackground;
88-
guiskin.button.active.textColor = Color.gray;
92+
guiskin.button.active.textColor = Color.white;
8993
guiskin.button.active.background = s_buttonActiveBackground;
9094
guiskin.button.onNormal.textColor = Color.white;
9195
guiskin.button.onNormal.background = s_buttonActiveNormalBackground;
@@ -128,28 +132,29 @@ private static GUISkin CreateSkin()
128132
guiskin.toggle.fixedHeight = 30;
129133

130134
guiskin.button.padding.top = guiskin.button.padding.bottom = 6;
135+
guiskin.button.padding.left = guiskin.button.padding.left = 5;
131136
guiskin.button.border.bottom = guiskin.button.border.top = 0;
132137
guiskin.button.border.left = guiskin.button.border.right = 10;
133138

134139
guiskin.textField.normal.background = s_fieldBackground;
135-
guiskin.textField.normal.textColor = Color.gray;
140+
guiskin.textField.normal.textColor = Color.white;
136141
guiskin.textField.onNormal.background = s_fieldBackground;
137-
guiskin.textField.onNormal.textColor = Color.gray;
142+
guiskin.textField.onNormal.textColor = Color.white;
138143
guiskin.textField.hover.background = s_fieldBackground;
139-
guiskin.textField.hover.textColor = Color.gray;
144+
guiskin.textField.hover.textColor = Color.white;
140145
guiskin.textField.onHover.background = s_fieldBackground;
141-
guiskin.textField.onHover.textColor = Color.gray;
146+
guiskin.textField.onHover.textColor = Color.white;
142147
guiskin.textField.active.background = s_fieldBackground;
143-
guiskin.textField.active.textColor = Color.gray;
148+
guiskin.textField.active.textColor = Color.white;
144149
guiskin.textField.onActive.background = s_fieldBackground;
145-
guiskin.textField.onActive.textColor = Color.gray;
150+
guiskin.textField.onActive.textColor = Color.white;
146151
guiskin.textField.focused.background = s_fieldBackground;
147-
guiskin.textField.focused.textColor = Color.gray;
152+
guiskin.textField.focused.textColor = Color.white;
148153
guiskin.textField.onFocused.background = s_fieldBackground;
149-
guiskin.textField.onFocused.textColor = Color.gray;
154+
guiskin.textField.onFocused.textColor = Color.white;
150155
guiskin.textField.padding = new RectOffset(8, 8, 5, 5);
151156

152-
guiskin.settings.cursorColor = Color.gray;
157+
guiskin.settings.cursorColor = Color.white;
153158

154159
guiskin.verticalScrollbar.normal.background = s_scrollBackground;
155160
guiskin.verticalScrollbarThumb.normal.background = s_scrollThumbBackground;

ValheimTooler/UI/SpriteManager.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using UnityEngine;
4+
using UnityEngine.UI;
45

56
namespace ValheimTooler.UI
67
{
@@ -13,7 +14,7 @@ static SpriteManager()
1314
s_atlasCache = new Dictionary<string, Texture2D>();
1415
}
1516

16-
public static Texture2D TextureFromSprite(Sprite sprite)
17+
public static Texture2D TextureFromSprite(Sprite sprite, bool resize = true)
1718
{
1819
if (sprite.rect.width == sprite.texture.width)
1920
{
@@ -33,14 +34,14 @@ public static Texture2D TextureFromSprite(Sprite sprite)
3334
}
3435

3536
Texture2D newText = new Texture2D((int)sprite.rect.width, (int)sprite.rect.height);
36-
Color[] newColors = spriteTexture.GetPixels((int)Math.Ceiling(sprite.textureRect.x),
37-
(int)Math.Ceiling(sprite.textureRect.y),
38-
(int)Math.Ceiling(sprite.textureRect.width),
39-
(int)Math.Ceiling(sprite.textureRect.height));
37+
Color[] newColors = spriteTexture.GetPixels(Mathf.CeilToInt(sprite.textureRect.x),
38+
Mathf.CeilToInt(sprite.textureRect.y),
39+
Mathf.CeilToInt(sprite.textureRect.width),
40+
Mathf.CeilToInt(sprite.textureRect.height));
4041
newText.SetPixels(newColors);
4142
newText.Apply();
4243

43-
if (newText.width > 200 || newText.height > 200)
44+
if (resize && (newText.width > 200 || newText.height > 200))
4445
newText.Resize(60, 60);
4546

4647
return newText;

0 commit comments

Comments
 (0)