spacepaste

Paste details

reply | raw

  1.  
  2. diff --git a/mycpu.c b/mycpu.c
  3. index 6f19d6a..c46f700 100644
  4. --- a/mycpu.c
  5. +++ b/mycpu.c
  6. @@ -24,13 +24,17 @@ static void my_cpu_set_property(GObject *object, guint prop_id,
  7. const GValue *value, GParamSpec *pspec);
  8. static void my_cpu_get_property(GObject *object, guint prop_id,
  9. GValue *value, GParamSpec *pspec);
  10. -static void my_cpu_size_request(GtkWidget *widget,
  11. - GtkRequisition *requisition);
  12. +static void my_cpu_get_preferred_width(GtkWidget *widget,
  13. + gint *minimal_w,
  14. + gint *natural_w);
  15. +static void my_cpu_get_preferred_height(GtkWidget *widget,
  16. + gint *minimal_h,
  17. + gint *natural_h);
  18. static void my_cpu_size_allocate(GtkWidget *widget,
  19. GtkAllocation *allocation);
  20. static void my_cpu_realize(GtkWidget *widget);
  21. -static gboolean my_cpu_expose(GtkWidget *widget,
  22. - GdkEventExpose *event);
  23. +static gboolean my_cpu_draw(GtkWidget *widget,
  24. + cairo_t *cr);
  26. /* Define type */
  27. G_DEFINE_TYPE(MyCpu, my_cpu, GTK_TYPE_WIDGET)
  28. @@ -50,9 +54,10 @@ static void my_cpu_class_init(MyCpuClass *klass) {
  29. g_class->get_property = my_cpu_get_property;
  31. w_class->realize = my_cpu_realize;
  32. - w_class->size_request = my_cpu_size_request;
  33. + w_class->get_preferred_width = my_cpu_get_preferred_width;
  34. + w_class->get_preferred_height = my_cpu_get_preferred_height;
  35. w_class->size_allocate = my_cpu_size_allocate;
  36. - w_class->expose_event = my_cpu_expose;
  37. + w_class->draw = my_cpu_draw;
  39. /* Install property */
  40. pspec = g_param_spec_double("percent", "Percent",
  41. @@ -143,16 +148,21 @@ static void my_cpu_realize(GtkWidget *widget) {
  42. gdk_window_set_user_data(priv->window, widget);
  43. gtk_widget_set_window(widget, priv->window);
  45. - widget->style = gtk_style_attach(gtk_widget_get_style( widget ),
  46. - priv->window);
  47. - gtk_style_set_background(widget->style, priv->window, GTK_STATE_NORMAL);
  48. +// widget->style = gtk_style_attach(gtk_widget_get_style( widget ),
  49. +// priv->window);
  50. +// gtk_style_set_background(widget->style, priv->window, GTK_STATE_NORMAL);
  51. }
  53. -static void my_cpu_size_request(GtkWidget *widget,
  54. - GtkRequisition *requisition) {
  55. -
  56. - requisition->width = WIDTH;
  57. - requisition->height = HEIGHT;
  58. +static void my_cpu_get_preferred_width(GtkWidget *widget,
  59. + gint *minimal_w,
  60. + gint *natural_w){
  61. + *minimal_w = *natural_w = WIDTH;
  62. +}
  63. +
  64. +static void my_cpu_get_preferred_height(GtkWidget *widget,
  65. + gint *minimal_h,
  66. + gint *natural_h){
  67. + *minimal_h = *natural_h = HEIGHT;
  68. }
  70. static void my_cpu_size_allocate(GtkWidget *widget,
  71. @@ -171,16 +181,13 @@ static void my_cpu_size_allocate(GtkWidget *widget,
  72. }
  73. }
  75. -static gboolean my_cpu_expose(GtkWidget *widget,
  76. - GdkEventExpose *event) {
  77. +static gboolean my_cpu_draw (GtkWidget *widget,
  78. + cairo_t *cr) {
  80. MyCpuPrivate *priv = MY_CPU(widget)->priv;
  81. - cairo_t *cr;
  82. gint limit;
  83. gint i;
  85. - cr = gdk_cairo_create(event->window);
  86. -
  87. cairo_translate(cr, 0, 7);
  89. cairo_set_source_rgb(cr, 0, 0, 0);
  90. @@ -201,8 +208,6 @@ static gboolean my_cpu_expose(GtkWidget *widget,
  91. cairo_fill(cr);
  92. }
  94. - cairo_destroy(cr);
  95. -
  96. return TRUE;
  97. }
  99.  
Powered by spacepaste. Paste removal.