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

Bug 113232. Delay setting transparency mask as long as possible to work around GTK stupidity. r=pavlov,sr=bz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@140783 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu 2003-04-07 04:35:16 +00:00
parent 99f7634305
commit be3b381966
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mozilla/widget/src/gtk/nsWindow.cpp
View File

@ -2577,6 +2577,17 @@ void nsWindow::SetInternalVisibility(PRBool aVisible)
if (aVisible)
{
// GTK wants us to set the window mask before we show the window
// for the first time, or setting the mask later won't work.
// GTK also wants us to NOT set the window mask if we're not really
// going to need it, because GTK won't let us unset the mask properly
// later.
// So, we delay setting the mask until the last moment: when the window
// is shown.
if (mTransparencyBitmap) {
ApplyTransparencyBitmap();
}
// show mSuperWin
gdk_window_show(mSuperWin->bin_window);
gdk_window_show(mSuperWin->shell_window);
@ -4387,6 +4398,18 @@ static void UpdateMaskBits(gchar* aMaskBits, PRInt32 aMaskWidth, PRInt32 aMaskHe
}
}
void nsWindow::ApplyTransparencyBitmap() {
gtk_widget_reset_shapes(mShell);
GdkBitmap* maskBitmap = gdk_bitmap_create_from_data(mShell->window,
mTransparencyBitmap,
mBounds.width, mBounds.height);
if (!maskBitmap)
return NS_ERROR_FAILURE;
gtk_widget_shape_combine_mask(mShell, maskBitmap, 0, 0);
gdk_bitmap_unref(maskBitmap);
}
NS_IMETHODIMP nsWindow::UpdateTranslucentWindowAlpha(const nsRect& aRect, PRUint8* aAlphas) {
nsWindow* top = FindTopLevelWindow();
if (top) {
@ -4403,7 +4426,7 @@ NS_IMETHODIMP nsWindow::UpdateTranslucentWindowAlpha(const nsRect& aRect, PRUint
memset(mTransparencyBitmap, 255, size);
}
NS_ASSERTION(aRect.x >= 0 && aRect.y >= 0
NS_ASSERTION(aRect.x >= 0 && aRect.y >= 0
&& aRect.XMost() <= mBounds.width && aRect.YMost() <= mBounds.height,
"Rect is out of window bounds");
@ -4414,15 +4437,9 @@ NS_IMETHODIMP nsWindow::UpdateTranslucentWindowAlpha(const nsRect& aRect, PRUint
UpdateMaskBits(mTransparencyBitmap, mBounds.width, mBounds.height, aRect, aAlphas);
gtk_widget_reset_shapes(mShell);
GdkBitmap* maskBitmap = gdk_bitmap_create_from_data(mShell->window,
mTransparencyBitmap,
mBounds.width, mBounds.height);
if (!maskBitmap)
return NS_ERROR_FAILURE;
gtk_widget_shape_combine_mask(mShell, maskBitmap, 0, 0);
gdk_bitmap_unref(maskBitmap);
if (mShown) {
ApplyTransparencyBitmap();
}
return NS_OK;
}

1
mozilla/widget/src/gtk/nsWindow.h
View File

@ -117,6 +117,7 @@ public:
NS_IMETHOD Destroy();
nsWindow* FindTopLevelWindow(); // returns nsnull if WE are top level
void ResizeTransparencyBitmap(PRInt32 aNewWidth, PRInt32 aNewHeight);
void ApplyTransparencyBitmap();
#ifdef INCLUDE_XUL
NS_IMETHOD SetWindowTranslucency(PRBool aTransparent);
NS_IMETHOD GetWindowTranslucency(PRBool& aTransparent);