From fcc319c1cd7857816447b68036252c82d7365df3 Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Fri, 22 Jun 2012 22:32:32 +0000
Subject: Version moins moche de l'IHM. Manque les bordures des GtkVuMeters

git-svn-id: file:///var/svn/2012-violon-leds/trunk@29 6be1fa4d-33ac-4c33-becc-79fcb3794bb6
---
 tests/test7/gtkvumeter.c | 3 ++-
 tests/test7/gui.glade    | 4 ++++
 tests/test7/test7.c      | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/test7/gtkvumeter.c b/tests/test7/gtkvumeter.c
index 34a2038..48e7885 100644
--- a/tests/test7/gtkvumeter.c
+++ b/tests/test7/gtkvumeter.c
@@ -208,7 +208,8 @@ static void gtk_vu_meter_size_allocate (GtkWidget *widget, GtkAllocation *alloca
     if (GTK_WIDGET_REALIZED (widget)) {
         if (vumeter->vertical == TRUE) { /* veritcal */
             gdk_window_move_resize (widget->window, allocation->x, allocation->y,
-                VERTICAL_VUMETER_WIDTH, MAX(allocation->height, MIN_VERTICAL_VUMETER_HEIGHT));
+                //VERTICAL_VUMETER_WIDTH, MAX(allocation->height, MIN_VERTICAL_VUMETER_HEIGHT));
+                MAX(VERTICAL_VUMETER_WIDTH,allocation->width), MAX(allocation->height, MIN_VERTICAL_VUMETER_HEIGHT));
         } else { /* horizontal */
             gdk_window_move_resize (widget->window, allocation->x, allocation->y,
                 MAX(allocation->width, MIN_HORIZONTAL_VUMETER_WIDTH), HORIZONTAL_VUMETER_HEIGHT);
diff --git a/tests/test7/gui.glade b/tests/test7/gui.glade
index b6207b1..14c013d 100644
--- a/tests/test7/gui.glade
+++ b/tests/test7/gui.glade
@@ -766,6 +766,7 @@ copy of the Program in return for a fee.
                   <object class="GtkAlignment" id="a_in_sound">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="border_width">2</property>
                     <property name="left_padding">12</property>
                     <child>
                       <placeholder/>
@@ -867,6 +868,7 @@ copy of the Program in return for a fee.
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="lbl_frame_transf">
+                    <property name="width_request">300</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">&lt;b&gt;Transfer function (Effect)&lt;/b&gt;</property>
@@ -899,6 +901,7 @@ copy of the Program in return for a fee.
                           <object class="GtkHBox" id="hb_out_hsv">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="border_width">2</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -919,6 +922,7 @@ copy of the Program in return for a fee.
                           <object class="GtkHBox" id="hb_out_rgb">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="border_width">2</property>
                             <child>
                               <placeholder/>
                             </child>
diff --git a/tests/test7/test7.c b/tests/test7/test7.c
index 52eb029..adaf2c8 100644
--- a/tests/test7/test7.c
+++ b/tests/test7/test7.c
@@ -75,10 +75,10 @@ void add_custom_widgets() {
 	GdkColor b_gradient_blue[2] = {{0,0,0,49151},{0,0,0,24575}};
 	GdkColor f_gradient_hue[7] = {{0,65535,0,0},{0,65535,0,65535},{0,0,0,65535},{0,0,65535,65535},{0,0,65535,0},{0,65535,65535,0},{0,65535,0,0}};
 	GdkColor b_gradient_hue[7] = {{0,49151,0,0},{0,49151,0,49151},{0,0,0,49151},{0,0,49151,49151},{0,0,49151,0},{0,49151,49151,0},{0,49151,0,0}};
-	GdkColor f_gradient_value[2] = {{0,65535,0,0},{0,32767,0,0}};
-	GdkColor b_gradient_value[2] = {{0,49151,0,0},{0,24575,0,0}};
-	GdkColor f_gradient_saturation[2] = {{0,32767,32767,32767},{0,32767,0,0}};
-	GdkColor b_gradient_saturation[2] = {{0,24575,24575,24575},{0,24575,0,0}};
+	GdkColor f_gradient_value[2] = {{0,65535,0,0},{0,16384,0,0}};
+	GdkColor b_gradient_value[2] = {{0,49151,0,0},{0,0,0,0}};
+	GdkColor f_gradient_saturation[2] = {{0,32767,0,0},{0,32767,32767,32767}};
+	GdkColor b_gradient_saturation[2] = {{0,24575,0,0},{0,24575,24575,24575}};
 
 	vumeter_sound = gtk_vu_meter_new(TRUE);
 	gtk_vu_meter_set_min_max(GTK_VU_METER(vumeter_sound), -50, 0);
-- 
cgit v1.2.3