summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2011-06-14 18:35:09 +0200
committerJon Bergli Heier <snakebite@jvnv.net>2011-06-14 18:35:09 +0200
commit9a56f664df9478e2caf79a5957a34b39eddc28e2 (patch)
tree88cd41533f015992d900979bae04a64413751476
parentc90bc73ff5cd413302d242c22540b29d0eedf0f8 (diff)
Misc UI changes and fixes.
- Edited Transparent widgets - Added new cursor (source: http://www.openclipart.org/detail/17539, public domain) - Set AutoScaled to false on both image sets
-rw-r--r--GUI/Transparent.imageset4
-rw-r--r--GUI/Transparent.pngbin4692 -> 2546 bytes
-rw-r--r--GUI/Transparent.xcfbin0 -> 17552 bytes
-rw-r--r--GUI/Vanilla.imageset2
-rw-r--r--gui.cpp2
5 files changed, 4 insertions, 4 deletions
diff --git a/GUI/Transparent.imageset b/GUI/Transparent.imageset
index 8d317dd..3259aa3 100644
--- a/GUI/Transparent.imageset
+++ b/GUI/Transparent.imageset
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<Imageset Name="Transparent-Images" Imagefile="Transparent.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
+<Imageset Name="Transparent-Images" Imagefile="Transparent.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false">
<Image Name="GenericBrush" XPos="46" YPos="46" Width="3" Height="3" />
<Image Name="FrameTopLeft" XPos="1" YPos="1" Width="6" Height="6" />
<Image Name="FrameTopRight" XPos="10" YPos="1" Width="6" Height="6" />
@@ -17,5 +17,5 @@
<Image Name="HorzScrollContainer" XPos="65" YPos="1" Width="1" Height="20" />
<Image Name="ScrollbarThumb" XPos="43" YPos="22" Width="20" Height="20" />
<Image Name="ShadowBrush" XPos="4" YPos="45" Width="24" Height="24" />
- <Image Name="MouseArrow" XPos="69" YPos="7" Width="17" Height="25" />
+ <Image Name="MouseArrow" XPos="69" YPos="7" Width="25" Height="25" />
</Imageset>
diff --git a/GUI/Transparent.png b/GUI/Transparent.png
index 3da2c88..7fb7b04 100644
--- a/GUI/Transparent.png
+++ b/GUI/Transparent.png
Binary files differ
diff --git a/GUI/Transparent.xcf b/GUI/Transparent.xcf
new file mode 100644
index 0000000..b0ee21f
--- /dev/null
+++ b/GUI/Transparent.xcf
Binary files differ
diff --git a/GUI/Vanilla.imageset b/GUI/Vanilla.imageset
index 0136e55..61c38a8 100644
--- a/GUI/Vanilla.imageset
+++ b/GUI/Vanilla.imageset
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<Imageset Name="Vanilla-Images" Imagefile="vanilla.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
+<Imageset Name="Vanilla-Images" Imagefile="vanilla.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false">
<Image Name="GenericBrush" XPos="46" YPos="46" Width="3" Height="3" />
<Image Name="FrameTopLeft" XPos="1" YPos="1" Width="6" Height="6" />
<Image Name="FrameTopRight" XPos="10" YPos="1" Width="6" Height="6" />
diff --git a/gui.cpp b/gui.cpp
index df865ea..be6b28f 100644
--- a/gui.cpp
+++ b/gui.cpp
@@ -34,7 +34,7 @@ void GUI::init() {
FontManager::getSingleton().create("VeraMono.font");
System::getSingleton().setDefaultFont( "VeraMono" );
- System::getSingleton().setDefaultMouseCursor( "Vanilla-Images", "MouseArrow" );
+ System::getSingleton().setDefaultMouseCursor( "Transparent-Images", "MouseArrow" );
WindowManager& wmgr(WindowManager::getSingleton());