changeset 2497:204d1bab71f9 trunk

[svn] - if (0 && hint_move_resize_available()) -- i'm not sure how this linked as we do not have a hint_move_resize_available().
author nenolod
date Sat, 10 Feb 2007 20:11:28 -0800
parents 71bee08db1c6
children ab99f1361735
files ChangeLog src/audacious/build_stamp.c src/audacious/ui_equalizer.c src/audacious/ui_main.c
diffstat 4 files changed, 17 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Feb 10 20:09:23 2007 -0800
+++ b/ChangeLog	Sat Feb 10 20:11:28 2007 -0800
@@ -1,3 +1,13 @@
+2007-02-11 04:09:23 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4002]
+  - widgetlist -> SkinnedWindow class + basic conversion in ui_main, other skinned windows remain
+  
+  trunk/src/audacious/ui_main.c           |  137 ++++++++++++++++----------------
+  trunk/src/audacious/ui_skinned_window.c |   49 +++++++++++
+  trunk/src/audacious/ui_skinned_window.h |    5 +
+  3 files changed, 125 insertions(+), 66 deletions(-)
+
+
 2007-02-11 01:04:31 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4000]
   - remove debugging notices
--- a/src/audacious/build_stamp.c	Sat Feb 10 20:09:23 2007 -0800
+++ b/src/audacious/build_stamp.c	Sat Feb 10 20:11:28 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070211-4000";
+const gchar *svn_stamp = "20070211-4002";
--- a/src/audacious/ui_equalizer.c	Sat Feb 10 20:09:23 2007 -0800
+++ b/src/audacious/ui_equalizer.c	Sat Feb 10 20:11:28 2007 -0800
@@ -362,16 +362,9 @@
     if (event->button == 1 && event->type == GDK_BUTTON_PRESS &&
         ((cfg.easy_move || cfg.equalizer_shaded || event->y < 14) &&
          !inside_sensitive_widgets(event->x, event->y))) {
-        if (0 && hint_move_resize_available()) {
-            hint_move_resize(equalizerwin, event->x_root,
-                             event->y_root, TRUE);
-            grab = FALSE;
-        }
-        else {
-            equalizerwin_raise();
-            dock_move_press(dock_window_list, GTK_WINDOW(equalizerwin), event,
-                            FALSE);
-        }
+         equalizerwin_raise();
+         dock_move_press(dock_window_list, GTK_WINDOW(equalizerwin), event,
+                         FALSE);
     }
     else if (event->button == 1 && event->type == GDK_2BUTTON_PRESS
              && event->y < 14) {
--- a/src/audacious/ui_main.c	Sat Feb 10 20:09:23 2007 -0800
+++ b/src/audacious/ui_main.c	Sat Feb 10 20:11:28 2007 -0800
@@ -1097,15 +1097,9 @@
     if (event->button == 1 && event->type == GDK_BUTTON_PRESS &&
         !ui_skinned_window_widgetlist_contained(mainwin, event->x, event->y) &&
         (cfg.easy_move || event->y < 14)) {
-        if (0 && hint_move_resize_available()) {
-            hint_move_resize(mainwin, event->x_root, event->y_root, TRUE);
-            grab = FALSE;
-        }
-        else {
-            gtk_window_present(GTK_WINDOW(mainwin));
-            dock_move_press(dock_window_list, GTK_WINDOW(mainwin), event,
-                            TRUE);
-        }
+        gtk_window_present(GTK_WINDOW(mainwin));
+        dock_move_press(dock_window_list, GTK_WINDOW(mainwin), event,
+                        TRUE);
     }
     else if (event->button == 1 && event->type == GDK_2BUTTON_PRESS &&
              event->y < 14 && !ui_skinned_window_widgetlist_contained(mainwin, event->x, event->y)) {