← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty-updates

« back to all changes in this revision

Viewing changes to khtml/css/css_renderstyledeclarationimpl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter
  • Date: 2008-12-11 18:26:08 UTC
  • mfrom: (1.1.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20081211182608-tsu6p8ncbw1gnqxt
Tags: 4:4.1.85-0ubuntu1
* New upstream release
* Patches:
  + Removed 15_kfreebsd_support.diff from patches/series (doesn't apply and
    has no use for Ubuntu)
  + Redid 20_use_dejavu_as_default_font.diff
  + Completely removed kubuntu_09_fix_application_menu.diff (applied upstream)
  + Refreshed kubuntu_54_use_xdg_menu_prefix.diff
  + Dropped plasma/widgets/toolbutton.cpp from kubuntu_qt_ftbfs.diff (applied
    upstream)
  + Global quilt refresh

Show diffs side-by-side

added added

removed removed

Lines of Context:
khtml/css/css_renderstyledeclarationimpl.cpp
442
442
        if (length.isPercent())
443
443
            string = QString::number(length.value()) + "%";
444
444
        else
445
 
            string = QString::number(length.minWidth(renderer->contentWidth()));
 
445
            string = QString::number(length.minWidth(renderer->contentWidth())) + "px";
446
446
        string += " ";
447
447
        length = style->backgroundYPosition();
448
448
        if (length.isPercent())
449
449
            string += QString::number(length.value()) + "%";
450
450
        else
451
 
            string += QString::number(length.minWidth(renderer->contentWidth()));
 
451
            string += QString::number(length.minWidth(renderer->contentWidth())) + "px";
452
452
        return new CSSPrimitiveValueImpl(string, CSSPrimitiveValue::CSS_STRING);
453
453
    }
454
454
    case CSS_PROP_BACKGROUND_POSITION_X: