Updating branch refs/heads/master
to 55167ee6008202f5e3a9e06f4666ee2b0d7c6398 (commit)
from afe29cd4644019fcadd771246894fe4f720aaf9a (commit)
commit 55167ee6008202f5e3a9e06f4666ee2b0d7c6398
Author: Stephan Arts <step...@xfce.org>
Date: Sun Nov 20 22:45:12 2011 +0100
Solve some rendering bugs
src/monitor_chooser.c | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/monitor_chooser.c b/src/monitor_chooser.c
index 9da671f..869fe1b 100644
--- a/src/monitor_chooser.c
+++ b/src/monitor_chooser.c
@@ -24,17 +24,28 @@
#include "monitor_chooser.h"
+#define RSTTO_MAX_MONITORS 9
+
typedef struct {
gint width;
gint height;
GdkPixbuf *pixbuf;
} Monitor;
+typedef struct {
+ guint x;
+ guint y;
+ guint width;
+ guint height;
+} MonitorPosition;
+
struct _RsttoMonitorChooserPriv
{
Monitor **monitors;
gint n_monitors;
gint selected;
+
+ MonitorPosition monitor_positions[RSTTO_MAX_MONITORS];
};
static GtkWidgetClass *parent_class = NULL;
@@ -63,6 +74,10 @@ static void
cb_rstto_button_press_event (GtkWidget *, GdkEventButton *event);
static void
+calculate_monitor_positions (
+ RsttoMonitorChooser *chooser );
+
+static void
paint_monitor ( cairo_t *cr,
gdouble x,
gdouble y,
@@ -252,8 +267,9 @@ rstto_monitor_chooser_paint(GtkWidget *widget)
for (; chooser->priv->monitors[index]; ++index)
{
monitor = chooser->priv->monitors[index];
+
/* Render the selected monitor a little bigger */
- if (chooser->priv->monitors[chooser->priv->selected] == monitor)
+ if (index == chooser->priv->selected)
{
if (monitor->width > monitor->height)
{
@@ -266,6 +282,7 @@ rstto_monitor_chooser_paint(GtkWidget *widget)
width = height;
}
label = g_strdup_printf("%d", index+1);
+ cairo_save (ctx);
paint_monitor (ctx,
((gdouble)widget->allocation.width/4) - (width/2.0),
((gdouble)widget->allocation.height - height)/2.0,
@@ -274,6 +291,7 @@ rstto_monitor_chooser_paint(GtkWidget *widget)
label,
monitor,
TRUE);
+ cairo_restore (ctx);
g_free (label);
}
else
@@ -293,6 +311,7 @@ rstto_monitor_chooser_paint(GtkWidget *widget)
label = g_strdup_printf("%d", index+1);
+ cairo_save (ctx);
paint_monitor (ctx,
((gdouble)widget->allocation.width/2)+
(((gdouble)widget->allocation.width/2)/
@@ -306,6 +325,7 @@ rstto_monitor_chooser_paint(GtkWidget *widget)
label,
monitor,
FALSE);
+ cairo_restore (ctx);
g_free (label);
id++;
@@ -327,6 +347,7 @@ rstto_monitor_chooser_paint(GtkWidget *widget)
height = 200;
width = 200;
}
+ cairo_save (ctx);
paint_monitor (ctx,
((gdouble)widget->allocation.width - width)/2.0,
((gdouble)widget->allocation.height - height)/2.0,
@@ -335,6 +356,7 @@ rstto_monitor_chooser_paint(GtkWidget *widget)
"1",
monitor,
TRUE);
+ cairo_restore (ctx);
}
}
@@ -487,6 +509,8 @@ paint_monitor ( cairo_t *cr,
monitor_x+(monitor_width-foot_height)/2.0,
monitor_y+(monitor_height+monitor_border_width+foot_height*0.5));
cairo_close_path (cr);
+ cairo_set_source (cr, monitor_pattern);
+ cairo_fill_preserve (cr);
cairo_set_source_rgba (cr, 0.2, 0.2, 0.2, 1.0);
cairo_set_line_width (cr, 1.0);
cairo_stroke (cr);
@@ -575,8 +599,9 @@ paint_monitor ( cairo_t *cr,
pango_cairo_layout_path (cr, layout);
cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.8);
cairo_fill_preserve (cr);
+ cairo_set_line_width (cr, 1.0);
cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.9);
- cairo_stroke_preserve (cr);
+ cairo_stroke (cr);
g_object_unref (layout);
pango_font_description_free (font_description);
@@ -611,6 +636,8 @@ rstto_monitor_chooser_add (
}
else
{
+ chooser->priv->selected = 0;
+
for (index = 0; chooser->priv->monitors[index]; ++index)
{
monitors[index] = chooser->priv->monitors[index];
@@ -733,3 +760,10 @@ rstto_monitor_chooser_set_style (
{
return FALSE;
}
+
+static void
+calculate_monitor_positions (
+ RsttoMonitorChooser *chooser )
+{
+
+}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
