Skip to content

Commit

Permalink
Fixed icon sizes in the chartable.
Browse files Browse the repository at this point in the history
  • Loading branch information
@fujiwarat
fujiwarat committed Aug 27, 2014
1 parent 51fa59e commit c01b0e3
Show file tree
Hide file tree
Showing 3 changed files with 128 additions and 6 deletions.
112 changes: 109 additions & 3 deletions input-pad/button-gtk.c
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* vim:set et sts=4: */
/* input-pad - The input pad
* Copyright (C) 2010-2012 Takao Fujiwara <takao.fujiwara1@gmail.com>
* Copyright (C) 2010-2012 Red Hat, Inc.
* Copyright (C) 2010-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
* Copyright (C) 2010-2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -217,10 +217,96 @@ input_pad_gtk_button_release_real (GtkWidget *widget,
return GTK_WIDGET_CLASS (input_pad_gtk_button_parent_class)->button_release_event (widget, event);
}

static int
context_render_string (cairo_t *cr, const gchar *label, int width, int height)
{
PangoFontDescription *desc;
PangoLayout *layout;
int lwidth = 0;
int lheight = 0;

if (height > 14)
desc = pango_font_description_from_string ("Monospace 10");
else
desc = pango_font_description_from_string ("Monospace 8");
layout = pango_cairo_create_layout (cr);
pango_layout_set_text (layout, label, -1);
pango_layout_get_size (layout, &lwidth, &lheight);

#if 0
g_print ("test %d %d %d %d\n",
lwidth / PANGO_SCALE, lheight / PANGO_SCALE, width, height);
#endif

cairo_move_to (cr,
(gdouble)(width - lwidth / PANGO_SCALE) / 2,
(gdouble)(height - lheight / PANGO_SCALE) / 2);
cairo_set_source_rgba (cr, 0., 0., 0., 1.);
pango_cairo_show_layout (cr, layout);
g_object_unref (layout);
pango_font_description_free (desc);

return lwidth / PANGO_SCALE;
}

static GdkPixbuf *
create_pixbuf(const gchar *label, int icon_height)
{
cairo_surface_t *image;
cairo_t *cr;
int width, height, lwidth;
GdkPixbuf *pixbuf = NULL;

if (icon_height <= 0)
icon_height = DEFAULT_ICON_SIZE;

image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
icon_height, icon_height);
cr = cairo_create (image);
width = cairo_image_surface_get_width (image);
height = cairo_image_surface_get_width (image);
cairo_set_source_rgba (cr, 0., 0., 0., 0.);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
lwidth = context_render_string (cr, label, width, height);

/* If label is more than two chars. */
if (lwidth > icon_height && lwidth < 1000) {
cairo_destroy (cr);
cairo_surface_destroy (image);

image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
lwidth, icon_height);
cr = cairo_create (image);
width = cairo_image_surface_get_width (image);
height = cairo_image_surface_get_width (image);
cairo_set_source_rgba (cr, 0., 0., 0., 0.);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
width = context_render_string (cr, label, width, icon_height);
}

pixbuf = gdk_pixbuf_get_from_surface (image, 0, 0, width, icon_height);
cairo_destroy (cr);
cairo_surface_destroy (image);
return pixbuf;
}


GtkWidget *
input_pad_gtk_button_new_with_label (const gchar *label)
{
return g_object_new (INPUT_PAD_TYPE_GTK_BUTTON, "label", label, NULL);
return input_pad_gtk_button_new_with_label_size (label, 0);
}

GtkWidget *
input_pad_gtk_button_new_with_label_size (const gchar *label, int icon_size)
{
GdkPixbuf *pixbuf = create_pixbuf(label, icon_size);
GtkWidget *image = gtk_image_new_from_pixbuf (pixbuf);
return g_object_new (INPUT_PAD_TYPE_GTK_BUTTON, "image", image, NULL);
}

GtkWidget *
Expand Down Expand Up @@ -400,3 +486,23 @@ input_pad_gtk_button_set_rawtext (InputPadGtkButton *button,

button->priv->rawtext = g_strdup (rawtext);
}

void
input_pad_gtk_button_set_label (InputPadGtkButton *button,
const gchar *label)
{
input_pad_gtk_button_set_label_size (button, label, 0);
}

void
input_pad_gtk_button_set_label_size (InputPadGtkButton *button,
const gchar *label,
int icon_size)
{
g_return_if_fail (button != NULL &&
INPUT_PAD_IS_GTK_BUTTON (button));

GdkPixbuf *pixbuf = create_pixbuf(label, icon_size);
GtkWidget *image = gtk_image_new_from_pixbuf (pixbuf);
gtk_button_set_image (GTK_BUTTON (button), image);
}
13 changes: 13 additions & 0 deletions input-pad/button-gtk.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@

G_BEGIN_DECLS

#define DEFAULT_ICON_SIZE 24
#define KEYBOARD_ICON_SIZE 14

#define INPUT_PAD_TYPE_GTK_BUTTON (input_pad_gtk_button_get_type ())
#define INPUT_PAD_GTK_BUTTON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), INPUT_PAD_TYPE_GTK_BUTTON, InputPadGtkButton))
#define INPUT_PAD_GTK_BUTTON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), INPUT_PAD_TYPE_GTK_BUTTON, InputPadGtkButtonClass))
Expand Down Expand Up @@ -59,6 +62,9 @@ struct _InputPadGtkButtonClass {

GType input_pad_gtk_button_get_type (void);
GtkWidget * input_pad_gtk_button_new_with_label (const gchar *label);
GtkWidget * input_pad_gtk_button_new_with_label_size
(const gchar *label,
int icon_size);
GtkWidget * input_pad_gtk_button_new_with_unicode (guint code);
guint input_pad_gtk_button_get_keycode
(InputPadGtkButton *button);
Expand Down Expand Up @@ -95,6 +101,13 @@ const gchar * input_pad_gtk_button_get_rawtext
void input_pad_gtk_button_set_rawtext
(InputPadGtkButton *button,
const gchar *rawtext);
void input_pad_gtk_button_set_label
(InputPadGtkButton *button,
const gchar *label);
void input_pad_gtk_button_set_label_size
(InputPadGtkButton *button,
const gchar *label,
int icon_size);

G_END_DECLS

Expand Down
9 changes: 6 additions & 3 deletions input-pad/window-gtk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@ on_window_keyboard_changed (InputPadGtkWindow *window,
input_pad_gtk_button_set_keysym (button, keysyms[group][0]);
display_name = get_keysym_display_name (keysyms[group][0],
GTK_WIDGET (window), &tooltip);
gtk_button_set_label (GTK_BUTTON (button), display_name);
input_pad_gtk_button_set_label_size (button, display_name,
KEYBOARD_ICON_SIZE);
gtk_widget_set_tooltip_text (GTK_WIDGET (button), tooltip);
g_free (display_name);
}
Expand Down Expand Up @@ -536,7 +537,8 @@ on_button_shift_clicked (GtkButton *button, gpointer data)
GTK_WIDGET (button),
&tooltip);
input_pad_gtk_button_set_keysym (gen_button, new_keysym);
gtk_button_set_label (GTK_BUTTON (gen_button), display_name);
input_pad_gtk_button_set_label_size (gen_button, display_name,
KEYBOARD_ICON_SIZE);
g_free (display_name);
gtk_widget_set_tooltip_text (GTK_WIDGET (gen_button), tooltip);
}
Expand Down Expand Up @@ -2375,7 +2377,8 @@ create_keyboard_layout_ui_real_default (GtkWidget *vbox, InputPadGtkWindow *wind
display_name = get_keysym_display_name (key_row->keysym[0][0],
GTK_WIDGET (window),
&tooltip);
button = input_pad_gtk_button_new_with_label (display_name);
button = input_pad_gtk_button_new_with_label_size (display_name,
KEYBOARD_ICON_SIZE);
gtk_widget_set_tooltip_text (button, tooltip);
g_free (display_name);
input_pad_gtk_button_set_keycode (INPUT_PAD_GTK_BUTTON (button),
Expand Down

0 comments on commit c01b0e3

Please sign in to comment.