Author: rpmcruz Date: Mon Apr 19 15:37:25 2010 New Revision: 61766 URL: http://svn.opensuse.org/viewcvs/yast?rev=61766&view=rev Log: * src/pkg/ygtkpkgdetailview.cc: several bug fixes with regard to esoteric color schemes. * src/ygtkrichtext.c: fixes for esoteric color schemes when search for a keyword. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/ygtkrichtext.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=61766&r1=61765&r2=61766&view=diff ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Apr 19 15:37:25 2010 @@ -1,5 +1,13 @@ 2010-04-19 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> + * src/pkg/ygtkpkgdetailview.cc: several bug fixes with + regard to esoteric color schemes. + + * src/ygtkrichtext.c: fixes for esoteric color schemes + when search for a keyword. + +2010-04-19 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> + * src/pkg/ygtkpkgpatternview.cc: unify pixbuf and text cells. Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc?rev=61766&r1=61765&r2=61766&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Mon Apr 19 15:37:25 2010 @@ -24,8 +24,12 @@ static const char *onlyInstalledMsg = _("<i>Information only available for installed packages.</i>"); +#if 0 static const char *keywordOpenTag = "<font color=\"#000000\" bgcolor=\"#ffff00\">"; static const char *keywordCloseTag = "</font>"; +#else +static const char *keywordOpenTag = "<keyword>", *keywordCloseTag = "</keyword>"; +#endif struct DetailWidget { virtual ~DetailWidget() {} @@ -58,7 +62,7 @@ Ypp::ListProps props (list); str = "<p bgcolor=\""; str += props.toModify() ? "#f4f4b7" : "#ededed"; - str += "\">"; + str += "\"><font color=\"#000000\">"; if (list.size() == 1) { Ypp::Selectable &sel = list.get (0); if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) @@ -71,7 +75,7 @@ str += _("Several selected"); str += "</b>"; } - str += "</p>"; + str += "</font></p>"; } ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } @@ -607,7 +611,8 @@ cairo_t *cr = gdk_cairo_create (widget->window); cairo_rectangle (cr, x, y, w, h); - cairo_set_source_rgb (cr, 245/255.0, 245/255.0, 245/255.0); + // use alpha to cope with styles who might not have a white background + cairo_set_source_rgba (cr, 0, 0, 0, .060); cairo_fill (cr); cairo_destroy (cr); return FALSE; @@ -1131,6 +1136,7 @@ widget = new DetailDescription(); m_widgets.push_back (widget); gtk_box_pack_start (GTK_BOX (main_vbox), widget->getWidget(), FALSE, TRUE, 0); + GtkWidget *detail_description = widget->getWidget(); if (YGPackageSelector::get()->onlineUpdateMode()) { widget = new ContentsExpander(); @@ -1161,7 +1167,7 @@ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); g_signal_connect (G_OBJECT (vbox), "expose-event", - G_CALLBACK (white_expose_cb), NULL); + G_CALLBACK (text_expose_cb), detail_description); m_scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_scroll), @@ -1209,11 +1215,11 @@ YGUtils::scrollWidget (vadj, true); } - static gboolean white_expose_cb (GtkWidget *widget, GdkEventExpose *event) + static gboolean text_expose_cb (GtkWidget *widget, GdkEventExpose *event, GtkWidget *text) { cairo_t *cr = gdk_cairo_create (widget->window); - GdkColor color = { 0, 255 << 8, 255 << 8, 255 << 8 }; - gdk_cairo_set_source_color (cr, &color); + GdkColor *color = &text->style->base [GTK_STATE_NORMAL]; + gdk_cairo_set_source_color (cr, color); cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height); cairo_fill (cr); Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=61766&r1=61765&r2=61766&view=diff ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Mon Apr 19 15:37:25 2010 @@ -108,10 +108,7 @@ rtext->hand_cursor = gdk_cursor_new_for_display (display, GDK_HAND2); gdk_cursor_ref (rtext->hand_cursor); -#if GTK_CHECK_VERSION(2,10,0) gtk_widget_style_get (widget, "link_color", &link_color, NULL); -#endif - g_signal_connect (tview, "event-after", G_CALLBACK (event_after), NULL); @@ -149,7 +146,8 @@ gtk_text_buffer_create_tag (buffer, "center", "justification", GTK_JUSTIFY_CENTER, NULL); gtk_text_buffer_create_tag (buffer, "right", "justification", GTK_JUSTIFY_RIGHT, NULL); // helpers - gtk_text_buffer_create_tag (buffer, "keyword", "background", "yellow", NULL); + gtk_text_buffer_create_tag (buffer, "keyword", "background", "yellow", + "foreground", "#000000", NULL); } static void ygtk_rich_text_destroy (GtkObject *object) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org