projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2011-10-07 [colin] 3.7.10cvs23
[claws.git] / src / gtk / gtkshruler.c
diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c
index d2fff5b2fbe96a824ffd90ca4d6bce53c48c0bdb..aaeb0fd639e2ac202fcc77041cd4a1ba1e41046e 100644 (file)
--- a/src/gtk/gtkshruler.c
+++ b/src/gtk/gtkshruler.c
@@ -1,11 +1,11 @@
 /* GtkSHRuler
  *
 /* GtkSHRuler
  *
- *  Copyright (C) 2000-2004 Alfons Hoogervorst & The Sylpheed Claws Team
+ *  Copyright (C) 2000-2011 Alfons Hoogervorst & The Claws Mail Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
  
 /* I derived this class from hruler. S in HRuler could be read as
  */
  
 /* I derived this class from hruler. S in HRuler could be read as
@@ -31,8 +29,12 @@
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <gtk/gtkhruler.h>
+#include <gtk/gtk.h>
 #include "gtkshruler.h"
 #include "gtkshruler.h"
+#include "utils.h"
+#include "gtkutils.h"
+
+#if !GTK_CHECK_VERSION(2,24,0)
 
 #define RULER_HEIGHT          14
 #define MINIMUM_INCR          5
 
 #define RULER_HEIGHT          14
 #define MINIMUM_INCR          5
@@ -44,9 +46,6 @@
 static void gtk_shruler_class_init     (GtkSHRulerClass *klass);
 static void gtk_shruler_init           (GtkSHRuler      *hruler);
 static void gtk_shruler_draw_ticks     (GtkRuler        *ruler);
 static void gtk_shruler_class_init     (GtkSHRulerClass *klass);
 static void gtk_shruler_init           (GtkSHRuler      *hruler);
 static void gtk_shruler_draw_ticks     (GtkRuler        *ruler);
-#if 0
-static void gtk_shruler_draw_pos       (GtkRuler        *ruler);
-#endif
 
 GType
 gtk_shruler_get_type(void)
 
 GType
 gtk_shruler_get_type(void)
@@ -80,8 +79,8 @@ gtk_shruler_class_init(GtkSHRulerClass * klass)
        GtkWidgetClass * widget_class;
        GtkRulerClass * hruler_class;
 
        GtkWidgetClass * widget_class;
        GtkRulerClass * hruler_class;
 
-       widget_class = (GtkWidgetClass*) klass;
-       hruler_class = (GtkRulerClass*) klass;
+       widget_class = GTK_WIDGET_CLASS(klass);
+       hruler_class = GTK_RULER_CLASS(klass);
 
        /* just neglect motion notify events */
        widget_class->motion_notify_event = NULL /* gtk_shruler_motion_notify */;
 
        /* just neglect motion notify events */
        widget_class->motion_notify_event = NULL /* gtk_shruler_motion_notify */;
@@ -118,23 +117,25 @@ static void
 gtk_shruler_draw_ticks(GtkRuler *ruler)
 {
        GtkWidget *widget;
 gtk_shruler_draw_ticks(GtkRuler *ruler)
 {
        GtkWidget *widget;
-       GdkGC *gc, *bg_gc;
+       cairo_t *cr;
        gint i;
        gint width, height;
        gint xthickness;
        gint ythickness;
        gint pos;
 
        gint i;
        gint width, height;
        gint xthickness;
        gint ythickness;
        gint pos;
 
-       g_return_if_fail (ruler != NULL);
-       g_return_if_fail (GTK_IS_HRULER (ruler));
+       cm_return_if_fail (ruler != NULL);
+       cm_return_if_fail (GTK_IS_HRULER (ruler));
 
 
-       if (!GTK_WIDGET_DRAWABLE (ruler)) 
+       if (!gtkut_widget_is_drawable (GTK_WIDGET(ruler))) 
                return;
 
        widget = GTK_WIDGET (ruler);
        
                return;
 
        widget = GTK_WIDGET (ruler);
        
-       gc = widget->style->fg_gc[GTK_STATE_NORMAL];
-       bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL];
+       cr = gdk_cairo_create(ruler->backing_store);
+       cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+       cairo_set_line_width(cr, 1.);
+       gdk_cairo_set_source_color(cr, &gtk_widget_get_style(widget)->text[GTK_STATE_NORMAL]);
 
        xthickness = widget->style->xthickness;
        ythickness = widget->style->ythickness;
 
        xthickness = widget->style->xthickness;
        ythickness = widget->style->ythickness;
@@ -148,27 +149,18 @@ gtk_shruler_draw_ticks(GtkRuler *ruler)
                       0, 0, 
                       widget->allocation.width, widget->allocation.height);
 
                       0, 0, 
                       widget->allocation.width, widget->allocation.height);
 
-#if 0
-       gdk_draw_line (ruler->backing_store, gc,
-                      xthickness,
-                      height + ythickness,
-                      widget->allocation.width - xthickness,
-                      height + ythickness);
-#endif
-
-       /* assume ruler->max_size has the char width */    
+       /* assume ruler->max_size has the char width */
        /* i is increment of char_width,  pos is label number
        /* i is increment of char_width,  pos is label number
-        * y position is based on height of widget itself
-        */
+        * y position is based on height of widget itself */
        for ( i = 0, pos = 0; i < widget->allocation.width - xthickness; i += ruler->max_size, pos++ ) {        
        for ( i = 0, pos = 0; i < widget->allocation.width - xthickness; i += ruler->max_size, pos++ ) {        
-               int length = height / 4;
+               gint length = height / 8;
        
        
-               if ( pos % 10 == 0 ) length = ( 3 * height / 4 );
-               else if (pos % 5 == 0 ) length = ( height / 2 );
+               if ( pos % 10 == 0 ) length = ( 2 * height / 3 );
+               else if ( pos % 5 == 0 ) length = ( height / 3 );
                
                
-               gdk_draw_line(ruler->backing_store, gc,
-                             i, height, 
-                             i, height - length);                      
+               cairo_move_to(cr, i, height + ythickness);
+               cairo_line_to(cr, i, height - length);
+               cairo_stroke(cr);
                
                if ( pos % 10 == 0 ) {
                        gchar buf[8];
                
                if ( pos % 10 == 0 ) {
                        gchar buf[8];
@@ -176,37 +168,17 @@ gtk_shruler_draw_ticks(GtkRuler *ruler)
 
                        /* draw label */
                        g_snprintf(buf, sizeof buf, "%d", pos);
 
                        /* draw label */
                        g_snprintf(buf, sizeof buf, "%d", pos);
-                       
+
                        layout = gtk_widget_create_pango_layout
                        layout = gtk_widget_create_pango_layout
-                                       (GTK_WIDGET(ruler), buf);
-                       
-                       gdk_draw_layout(ruler->backing_store, gc, i + 2,
-                                       (height / 12),
-                                       layout);
-                       
+                               (GTK_WIDGET(ruler), buf);
+
+                       cairo_move_to(cr, i+2, 0);
+                       pango_cairo_show_layout(cr, layout);
+
                        g_object_unref(layout);
                        g_object_unref(layout);
-           }
+               }
        }
        }
-}
 
 
-/* gtk_ruler_set_pos() - does not work yet, need to reimplement 
- * gtk_ruler_draw_pos(). */
-void
-gtk_shruler_set_pos(GtkSHRuler * ruler, gfloat pos)
-{
-       GtkRuler * ruler_;
-       g_return_if_fail( ruler != NULL );
-       
-       ruler_ = GTK_RULER(ruler);
-       
-       if ( pos < ruler_->lower ) 
-               pos = ruler_->lower;
-       if ( pos > ruler_->upper )
-               pos = ruler_->upper;
-       
-       ruler_->position = pos; 
-       
-       /*  Make sure the ruler has been allocated already  */
-       if ( ruler_->backing_store != NULL )
-               gtk_ruler_draw_pos(ruler_);
+       cairo_destroy(cr);
 }
 }
+#endif
Claws Mail