Author: rpmcruz
Date: Tue Dec 2 00:40:32 2008
New Revision: 53794
URL: http://svn.opensuse.org/viewcvs/yast?rev=53794&view=rev
Log:
* src/YGPushButton.cc: bug fix 449740: use functionKey as a stock
icon fallback.
* src/YGLayout.cc: include YMenuButtons into the horizontal box
size-group.
* src/ygtkcellrenderertextpixbuf.c: clear Y-padding.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/YGLayout.cc
trunk/gtk/src/YGPushButton.cc
trunk/gtk/src/ygtkcellrenderertextpixbuf.c
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53794&r1=53793&r2=53794&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Tue Dec 2 00:40:32 2008
@@ -1,3 +1,13 @@
+2008-12-01 Ricardo Cruz
+
+ * src/YGPushButton.cc: bug fix 449740: use functionKey as a stock
+ icon fallback.
+
+ * src/YGLayout.cc: include YMenuButtons into the horizontal box
+ size-group.
+
+ * src/ygtkcellrenderertextpixbuf.c: clear Y-padding.
+
2008-12-01 Michael Meeks
fix: #446064 - lots of code movement, regression tests and little
Modified: trunk/gtk/src/YGLayout.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLayout.cc?rev=53794&r1=53793&r2=53794&view=diff
==============================================================================
--- trunk/gtk/src/YGLayout.cc (original)
+++ trunk/gtk/src/YGLayout.cc Tue Dec 2 00:40:32 2008
@@ -42,6 +42,7 @@
}
#include "YPushButton.h"
+#include "YMenuButton.h"
class ButtonHeightGroup
{
@@ -52,8 +53,8 @@
void addWidget (YWidget *ywidget)
{
- YPushButton *button = dynamic_cast (ywidget);
- if (button) {
+ if (dynamic_cast (ywidget) ||
+ dynamic_cast (ywidget)) {
bool create_group = !group;
if (create_group)
group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
Modified: trunk/gtk/src/YGPushButton.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPushButton.cc?rev=53794&r1=53793&r2=53794&view=diff
==============================================================================
--- trunk/gtk/src/YGPushButton.cc (original)
+++ trunk/gtk/src/YGPushButton.cc Tue Dec 2 00:40:32 2008
@@ -32,6 +32,29 @@
{
if (!m_customIcon) {
const char *stock = NULL;
+ if (hasFunctionKey())
+ switch (functionKey()) {
+ case 2:
+ stock = GTK_STOCK_INFO;
+ break;
+ case 3:
+ stock = GTK_STOCK_ADD;
+ break;
+ case 4:
+ stock = GTK_STOCK_EDIT;
+ break;
+ case 5:
+ stock = GTK_STOCK_DELETE;
+ break;
+ case 6:
+ stock = GTK_STOCK_EXECUTE;
+ break;
+ case 7:
+ stock = GTK_STOCK_PREFERENCES;
+ break;
+ default:
+ break;
+ }
#if YAST2_VERSION >= 2017006
switch (role()) {
case YOKButton:
Modified: trunk/gtk/src/ygtkcellrenderertextpixbuf.c
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkcellrenderertextpixbuf.c?rev=53794&r1=53793&r2=53794&view=diff
==============================================================================
--- trunk/gtk/src/ygtkcellrenderertextpixbuf.c (original)
+++ trunk/gtk/src/ygtkcellrenderertextpixbuf.c Tue Dec 2 00:40:32 2008
@@ -79,7 +79,8 @@
return NULL;
}
-#define BORDER 1
+#define XPAD 1
+#define YPAD 0
static void ygtk_cell_renderer_text_pixbuf_get_size (GtkCellRenderer *cell,
GtkWidget *widget, GdkRectangle *cell_area, gint *xoffset, gint *yoffset,
@@ -112,8 +113,8 @@
g_object_unref (G_OBJECT (layout));
}
- *width += (cell->xpad+BORDER)*2;
- *height += (cell->ypad+BORDER)*2;
+ *width += (cell->xpad+XPAD)*2;
+ *height += (cell->ypad+YPAD)*2;
}
static void ygtk_cell_renderer_text_pixbuf_render (GtkCellRenderer *cell,
@@ -178,7 +179,7 @@
pixbuf_y = yalign * (cell_area->height - pixbuf_height);
// paint
- int x = cell_area->x + cell->xpad+BORDER, y = cell_area->y + cell->ypad+BORDER;
+ int x = cell_area->x + cell->xpad+XPAD, y = cell_area->y + cell->ypad+YPAD;
if (pixbuf) {
cairo_t *cr = gdk_cairo_create (window);
gdk_cairo_set_source_pixbuf (cr, pixbuf, pixbuf_x+x, pixbuf_y+y);
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
