Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=337381, button on dropdown lists is too skinny on linux, patch from ispiked@gmail.com, r=vladimir

Browse Source
This commit is contained in:
vladimir%pobox.com 2006-08-30 22:11:01 +00:00
parent 6c5fab0297
commit 3db9bf7dac
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gfx/src/thebes/nsThebesDeviceContext.cpp
View File

@ -237,6 +237,30 @@ nsThebesDeviceContext::Init(nsNativeWidget aWidget)
}
// XXX
mDepth = 24;
// Cache scrollbar sizes for GTK.
GtkRequisition req;
GtkWidget *sb;
sb = gtk_vscrollbar_new(NULL);
gtk_widget_ref(sb);
gtk_object_sink(GTK_OBJECT(sb));
gtk_widget_ensure_style(sb);
gtk_widget_queue_resize(sb);
gtk_widget_size_request(sb,&req);
mGTKScrollbarWidth = req.width;
gtk_widget_destroy(sb);
gtk_widget_unref(sb);
sb = gtk_hscrollbar_new(NULL);
gtk_widget_ref(sb);
gtk_object_sink(GTK_OBJECT(sb));
gtk_widget_ensure_style(sb);
gtk_widget_queue_resize(sb);
gtk_widget_size_request(sb,&req);
mGTKScrollbarHeight = req.height;
gtk_widget_destroy(sb);
gtk_widget_unref(sb);
#endif
#ifdef XP_WIN
@ -358,15 +382,16 @@ nsThebesDeviceContext::SupportsNativeWidgets(PRBool &aSupportsWidgets)
NS_IMETHODIMP
nsThebesDeviceContext::GetScrollBarDimensions(float &aWidth, float &aHeight) const
{
#ifdef XP_WIN
float scale;
GetCanonicalPixelScale(scale);
#ifdef MOZ_ENABLE_GTK2
aWidth = mGTKScrollbarWidth * mDevUnitsToAppUnits * scale;
aHeight = mGTKScrollbarHeight * mDevUnitsToAppUnits * scale;
#elif XP_WIN
aWidth = ::GetSystemMetrics(SM_CXVSCROLL) * mDevUnitsToAppUnits * scale;
aHeight = ::GetSystemMetrics(SM_CXHSCROLL) * mDevUnitsToAppUnits * scale;
#else
NS_WARNING("Couldn't get scrollbar size from system, so setting to 10px. FIX ME!");
aWidth = 10.0f * mPixelsToTwips;
aHeight = 10.0f * mPixelsToTwips;
#endif

5
gfx/src/thebes/nsThebesDeviceContext.h
View File

@ -141,7 +141,10 @@ private:
PRInt32 mWidth;
PRInt32 mHeight;
#ifdef MOZ_ENABLE_GTK2
PRInt16 mGTKScrollbarHeight;
PRInt16 mGTKScrollbarWidth;
#endif
PRBool mPrinter;
nsRefPtrHashtable<nsISupportsHashKey, gfxASurface> mWidgetSurfaceCache;