Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 11:38:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add comment to scrollbar about a bug and fix for stupid drawing code on unix that goes along with beard's checking for 13131. removes some unneeded duplication of code. r=blizzard,paulmac,beard

Browse Source
This commit is contained in:
pavlov%netscape.com 1999-11-30 22:33:56 +00:00
parent cb9ed8a1d4
commit f00a100615
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/src/gtk/nsScrollbar.cpp
View File

@ -157,11 +157,17 @@ NS_IMETHODIMP nsScrollbar::GetMaxRange (PRUint32 & aMaxRange)
//-------------------------------------------------------------------------
NS_IMETHODIMP nsScrollbar::SetPosition (PRUint32 aPos)
{
// if (mAdjustment)
// gtk_adjustment_set_value (GTK_ADJUSTMENT (mAdjustment), (float) aPos);
// if (mAdjustment)
// gtk_adjustment_set_value (GTK_ADJUSTMENT (mAdjustment), (float) aPos);
if (mAdjustment && mWidget)
{
// XXX - pav
// this should be working fine, but for some reason we still get the additional value_changed
// i'm not sure why, but since we are using GFX scrollbars, this problem doesn't happen.
// see bug http://bugzilla.mozilla.org/show_bug.cgi?id=13407 for more details.
//
// The following bit of code borrowed from gtkrange.c,
// gtk_range_adjustment_value_changed():

46
widget/src/gtk/nsWindow.cpp
View File

@ -347,11 +347,25 @@ NS_IMETHODIMP nsWindow::Update(void)
UnqueueDraw();
if (!mUpdateArea->IsEmpty()) {
PRInt32 x, y, width, height;
mUpdateArea->GetBoundingBox (&x, &y, &width, &height);
DoPaint (x, y, width, height, mUpdateArea);
nsRegionRectSet *regionRectSet = nsnull;
if (NS_FAILED(mUpdateArea->GetRects(&regionRectSet)))
return NS_ERROR_FAILURE;
PRUint32 len;
PRUint32 i;
len = regionRectSet->mRectsLen;
for (i=0;i<len;++i)
{
nsRegionRect *r = &(regionRectSet->mRects[i]);
DoPaint (r->x, r->y, r->width, r->height, mUpdateArea);
}
mUpdateArea->FreeRects(regionRectSet);
mUpdateArea->SetTo(0, 0, 0, 0);
return NS_OK;
}
@ -1025,7 +1039,9 @@ NS_METHOD nsWindow::CreateNative(GtkObject *parentWidget)
// set our background color to make people happy.
SetBackgroundColor(NS_RGB(192,192,192));
// SetBackgroundColor(NS_RGB(192,192,192));
gdk_window_set_back_pixmap(mSuperWin->bin_window, NULL, 0);
// track focus changes if we have a mozarea
if (mMozArea) {
@ -1788,7 +1804,7 @@ NS_IMETHODIMP nsWindow::Show(PRBool bState)
// don't show if we are too small
if (mIsTooSmall && bState == PR_FALSE)
if (mIsTooSmall)
return NS_OK;
// show
@ -1825,7 +1841,7 @@ NS_IMETHODIMP nsWindow::Show(PRBool bState)
gtk_widget_hide(mMozArea);
//gtk_widget_unmap(mShell);
}
// For some strange reason, gtk_widget_hide() does not seem to
// unmap the window.
// gtk_widget_unmap(mWidget);
@ -1845,7 +1861,7 @@ NS_IMETHODIMP nsWindow::Show(PRBool bState)
// don't show if we are too small
if (mIsTooSmall && bState == PR_FALSE)
if (mIsTooSmall)
return NS_OK;
// show
@ -1987,6 +2003,7 @@ NS_IMETHODIMP nsWindow::Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
mIsTooSmall = PR_TRUE;
if (GTK_WIDGET_VISIBLE(mShell))
{
gtk_widget_hide(mMozArea);
gtk_widget_hide(mShell);
gtk_widget_unmap(mShell);
}
@ -2058,17 +2075,8 @@ NS_IMETHODIMP nsWindow::Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
#endif
if (nNeedToShow)
{
if (mIsToplevel && mShell)
{
gtk_widget_show(mShell);
}
else
{
gdk_window_show(mSuperWin->bin_window);
gdk_window_show(mSuperWin->shell_window);
}
}
Show(PR_TRUE);
return NS_OK;
}