changeset 1837:be26ff803e4f trunk

[svn] - Make mainwin shading work correctly.
author nhjm449
date Thu, 05 Oct 2006 21:31:27 -0700
parents a1089ea6f436
children e765e7a40685
files ChangeLog audacious/mainwin.c
diffstat 2 files changed, 21 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 05 20:18:41 2006 -0700
+++ b/ChangeLog	Thu Oct 05 21:31:27 2006 -0700
@@ -1,3 +1,13 @@
+2006-10-06 03:18:41 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2629]
+  - implement textboxBitmapFontWidth and textboxBitmapFontHeight for defining the size of a cell in the textbox character grid
+  
+  trunk/audacious/widgets/skin.c    |   18 +++++
+  trunk/audacious/widgets/skin.h    |    4 -
+  trunk/audacious/widgets/textbox.c |  123 +++++++++++++++++++-------------------
+  3 files changed, 85 insertions(+), 60 deletions(-)
+
+
 2006-10-06 02:50:10 +0000  George Averill <nhjm449@gmail.com>
   revision [2627]
   - revert to 2599
--- a/audacious/mainwin.c	Thu Oct 05 20:18:41 2006 -0700
+++ b/audacious/mainwin.c	Thu Oct 05 21:31:27 2006 -0700
@@ -956,12 +956,19 @@
     {
         gdk_window_set_hints(mainwin->window, 0, 0,
 				bmp_active_skin->properties.mainwin_width,
-				bmp_active_skin->properties.mainwin_height,
+				cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height,
 				bmp_active_skin->properties.mainwin_width,
-				bmp_active_skin->properties.mainwin_height,
+				cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height,
                                 GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
-        gtk_window_resize(GTK_WINDOW(mainwin), bmp_active_skin->properties.mainwin_width,
-		bmp_active_skin->properties.mainwin_height);
+        gdk_window_resize(mainwin->window, bmp_active_skin->properties.mainwin_width,
+		cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height);
+        gdk_window_set_hints(mainwin->window, 0, 0,
+                                bmp_active_skin->properties.mainwin_width,
+                                cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height,
+                                bmp_active_skin->properties.mainwin_width,
+                                cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height,
+                                GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
+	gdk_flush();
     }
 
     /* visibility attributes */