changeset 1855:ec2899d8b8af trunk

[svn] - don't use hardcoded values for the time indicator area
author nenolod
date Wed, 11 Oct 2006 17:47:31 -0700
parents 2ad0069dc0b2
children 6597c7bd11d9
files ChangeLog audacious/mainwin.c
diffstat 2 files changed, 23 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 11 12:37:16 2006 -0700
+++ b/ChangeLog	Wed Oct 11 17:47:31 2006 -0700
@@ -1,3 +1,15 @@
+2006-10-11 19:37:16 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2665]
+  - add the Osmosis skin, a more sophisticated example of the new skinning engine.
+  
+  trunk/skins/Makefile             |    2 -
+  trunk/skins/Osmosis/Makefile     |   24 ++++++++++++++++
+  trunk/skins/Osmosis/pledit.txt   |    6 ++++
+  trunk/skins/Osmosis/skin.hints   |   57 +++++++++++++++++++++++++++++++++++++++
+  trunk/skins/Osmosis/viscolor.txt |   24 ++++++++++++++++
+  5 files changed, 112 insertions(+), 1 deletion(-)
+
+
 2006-10-09 10:56:32 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2663]
   - resize fixes
--- a/audacious/mainwin.c	Wed Oct 11 12:37:16 2006 -0700
+++ b/audacious/mainwin.c	Wed Oct 11 17:47:31 2006 -0700
@@ -1381,18 +1381,22 @@
             grab = FALSE;
         }
     }
-    if (event->button == 1) {
-        if ((event->x > 35 && event->x < 100 &&
-             event->y > 25 && event->y < 40) ||
-            widget_contains(WIDGET(mainwin_stime_min), event->x, event->y) ||
-            widget_contains(WIDGET(mainwin_stime_sec), event->x, event->y)) {
-
+
+    if (event->button == 1)
+    {
+        if (widget_contains(WIDGET(mainwin_minus_num), event->x, event->y) ||
+		widget_contains(WIDGET(mainwin_10min_num), event->x, event->y) ||
+		widget_contains(WIDGET(mainwin_min_num), event->x, event->y) ||
+		widget_contains(WIDGET(mainwin_10sec_num), event->x, event->y) ||
+		widget_contains(WIDGET(mainwin_sec_num), event->x, event->y) ||
+		widget_contains(WIDGET(mainwin_stime_min), event->x, event->y) ||
+		widget_contains(WIDGET(mainwin_stime_sec), event->x, event->y))
+	{
             if (cfg.timer_mode == TIMER_ELAPSED)
                 set_timer_mode(TIMER_REMAINING);
             else
                 set_timer_mode(TIMER_ELAPSED);
         }
-
     }
 
     if (grab)