Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux printing improvements

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@189843 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%pavlov.net
2006-02-13 19:31:27 +00:00
parent 35d5038e18
commit 4ca438b5a6
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp
View File

@@ -145,25 +145,21 @@ nsThebesDeviceContext::SetDPI(PRInt32 aPrefDPI)
mDpi = 96;
#if defined(MOZ_ENABLE_GTK2)
if (mPrinter) {
mDpi = 600;
} else {
float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f;
OSVal = NSToCoordRound(float(::gdk_screen_width()) / screenWidthIn);
float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f;
OSVal = NSToCoordRound(float(::gdk_screen_width()) / screenWidthIn);
if (aPrefDPI > 0) {
// If there's a valid pref value for the logical resolution,
// use it.
mDpi = aPrefDPI;
} else if ((aPrefDPI == 0) || (OSVal > 96)) {
// Either if the pref is 0 (force use of OS value) or the OS
// value is bigger than 96, use the OS value.
mDpi = OSVal;
} else {
// if we couldn't get the pref or it's negative, and the OS
// value is under 96ppi, then use 96.
mDpi = 96;
}
if (aPrefDPI > 0) {
// If there's a valid pref value for the logical resolution,
// use it.
mDpi = aPrefDPI;
} else if ((aPrefDPI == 0) || (OSVal > 96)) {
// Either if the pref is 0 (force use of OS value) or the OS
// value is bigger than 96, use the OS value.
mDpi = OSVal;
} else {
// if we couldn't get the pref or it's negative, and the OS
// value is under 96ppi, then use 96.
mDpi = 96;
}
#elif defined(XP_WIN)
@@ -235,8 +231,8 @@ nsThebesDeviceContext::Init(nsNativeWidget aWidget)
// XXX
if (mPrinter) {
mWidth = mDpi * 8.5;
mHeight = mDpi * 11;
mWidth = NS_INCHES_TO_TWIPS(8.5) * mDevUnitsToAppUnits;
mHeight = NS_INCHES_TO_TWIPS(11) * mDevUnitsToAppUnits;
}
// XXX
mDepth = 24;