--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: kanjipad: uses B&W instead of GTk theme colours
- From: Michal Suchanek <hramrach@centrum.cz>
- Date: Sun, 17 May 2009 18:41:18 +0200
- Message-id: <20090517164118.26246.16400.reportbug@heretic.burning-in-hell>
Package: kanjipad
Version: 2.0.0-6
Severity: minor
Tags: patch
The pad area and kanji guesses are always drawn in B&W regardless of GTK
theme colours.
-- System Information:
Debian Release: 5.0.1
APT prefers stable
APT policy: (900, 'stable'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.29-1-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages kanjipad depends on:
ii libatk1.0-0 1.22.0-1 The ATK accessibility toolkit
ii libc6 2.9-7 GNU C Library: Shared libraries
ii libcairo2 1.8.6-2+b1 The Cairo 2D vector graphics libra
ii libfontconfig1 2.6.0-3 generic font configuration library
ii libglib2.0-0 2.20.1-1 The GLib library of C routines
ii libgtk2.0-0 2.16.1-2 The GTK+ graphical user interface
ii libpango1.0-0 1.24.0-3+b1 Layout and rendering of internatio
ii libx11-6 2:1.2.1-1 X11 client-side library
ii libxcursor1 1:1.1.9-1 X cursor management library
ii libxext6 2:1.0.4-1 X11 miscellaneous extension librar
ii libxi6 2:1.1.4-1 X11 Input extension library
ii libxinerama1 2:1.0.3-2 X11 Xinerama extension library
ii libxrandr2 2:1.3.0-2 X11 RandR extension library
ii libxrender1 1:0.9.4-2 X Rendering Extension client libra
Versions of packages kanjipad recommends:
ii ttf-kochi-gothic 1.0.20030809-8 Kochi Subst Gothic Japanese TrueTy
ii ttf-kochi-mincho 1.0.20030809-8 Kochi Subst Mincho Japanese TrueTy
kanjipad suggests no packages.
-- debconf-show failed
diff -ur kanjipad-2.0.0/kanjipad.c kanjipad-2.0.0.mod/kanjipad.c
--- kanjipad-2.0.0/kanjipad.c 2002-08-25 21:00:54.000000000 +0200
+++ kanjipad-2.0.0.mod/kanjipad.c 2009-05-17 18:36:12.000000000 +0200
@@ -133,7 +133,7 @@
{
gdk_draw_rectangle (kpixmap,
selected ? w->style->bg_gc[GTK_STATE_SELECTED] :
- w->style->white_gc,
+ w->style->bg_gc[GTK_STATE_NORMAL],
TRUE,
0, (char_height + 6) *index, w->allocation.width - 1, char_height + 5);
}
@@ -145,8 +145,8 @@
x = (w->allocation.width - char_width) / 2;
gdk_draw_layout (kpixmap,
- (selected > 0) ? w->style->white_gc :
- w->style->black_gc,
+ (selected > 0) ? w->style->fg_gc[GTK_STATE_SELECTED] :
+ w->style->fg_gc[GTK_STATE_NORMAL],
x, (char_height + 6) * index + 3, layout);
g_object_unref (layout);
}
@@ -160,7 +160,7 @@
int i;
gdk_draw_rectangle (kpixmap,
- w->style->white_gc, TRUE,
+ w->style->bg_gc[GTK_STATE_NORMAL], TRUE,
0, 0, width, height);
diff -ur kanjipad-2.0.0/padarea.c kanjipad-2.0.0.mod/padarea.c
--- kanjipad-2.0.0/padarea.c 2002-03-16 01:09:45.000000000 +0100
+++ kanjipad-2.0.0.mod/padarea.c 2009-05-17 18:28:34.000000000 +0200
@@ -70,7 +70,7 @@
y = CLAMP (y, 0, area->widget->allocation.height - sheight);
gdk_draw_layout (area->pixmap,
- area->widget->style->black_gc,
+ area->widget->style->fg_gc[GTK_STATE_NORMAL],
x, y, layout);
g_object_unref (layout);
@@ -90,7 +90,7 @@
guint16 height = area->widget->allocation.height;
gdk_draw_rectangle (area->pixmap,
- area->widget->style->white_gc, TRUE,
+ area->widget->style->bg_gc[GTK_STATE_NORMAL], TRUE,
0, 0, width, height);
tmp_list = area->strokes;
@@ -109,7 +109,7 @@
cur = (GdkPoint *)stroke_list->data;
if (old)
gdk_draw_line (area->pixmap,
- area->widget->style->black_gc,
+ area->widget->style->fg_gc[GTK_STATE_NORMAL],
old->x, old->y, cur->x, cur->y);
old = cur;
@@ -207,7 +207,7 @@
int xmin, ymin, xmax, ymax;
GdkPoint *old = (GdkPoint *)g_list_last (area->curstroke)->data;
- gdk_draw_line (area->pixmap, w->style->black_gc,
+ gdk_draw_line (area->pixmap, w->style->fg_gc[GTK_STATE_NORMAL],
old->x, old->y, x, y);
if (old->x < x) { xmin = old->x; xmax = x; }
--- End Message ---