AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added code for erasing the small square between scrollbars.

Browse Source 
Corrected window size if scrollbars is removed/added.
  Reduce flicker in scrollbars.
  Prevent scrollbars from jumping back to original position
    if the mouse just barely left the scrollbar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2002-03-30 11:16:24 +00:00
parent 9d353d4a22
commit a17a79bac3
5 changed files with 72 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/univ/scrolbar.cpp
View File

@ -42,6 +42,7 @@
#include "wx/univ/renderer.h"
#include "wx/univ/inphand.h"
#include "wx/univ/theme.h"
#include "wx/log.h"
#define WXDEBUG_SCROLLBAR
@ -388,7 +389,7 @@ void wxScrollBar::UpdateThumb()
}
#endif // WXDEBUG_SCROLLBAR
Refresh(TRUE, &rect);
Refresh(FALSE, &rect);
}
m_elementsState[n] &= ~wxCONTROL_DIRTY;

17
src/univ/themes/win32.cpp
View File

@ -4145,6 +4145,8 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control,
// if we're scrolling the scrollbar because the arrow or the shaft was
// pressed, check that the mouse stays on the same scrollbar element
#if 0
// Always let thumb jump back if we leave the scrollbar
if ( event.Moving() )
{
ht = m_renderer->HitTestScrollbar(scrollbar, event.GetPosition());
@ -4153,6 +4155,21 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control,
{
ht = wxHT_NOWHERE;
}
#else
// Jump back only if we get far away from it
wxPoint pos = event.GetPosition();
if (scrollbar->HasFlag( wxVERTICAL ))
{
if (pos.x > -20 && pos.x < scrollbar->GetSize().x+20)
pos.x = 5;
}
else
{
if (pos.y > -20 && pos.y < scrollbar->GetSize().y+20)
pos.y = 5;
}
ht = m_renderer->HitTestScrollbar(scrollbar, pos );
#endif
// if we're dragging the thumb and the mouse stays in the scrollbar, it
// is still ok - we only want to catch the case when the mouse leaves

4
src/univ/winuniv.cpp
View File

@ -843,8 +843,12 @@ void wxWindow::SetScrollbar(int orient,
// give the window a chance to relayout
if ( hasClientSizeChanged )
{
#if wxUSE_TWO_WINDOWS
wxWindowNative::SetSize( GetSize() );
#else
wxSizeEvent event(GetSize());
(void)GetEventHandler()->ProcessEvent(event);
#endif
}
}

2
src/x11/app.cpp
View File

@ -734,7 +734,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
{
if (!win->IsEnabled())
return FALSE;
// Here we check if the top level window is
// disabled, which is one aspect of modality.
wxWindow *tlw = win;

70
src/x11/window.cpp
View File

@ -40,6 +40,7 @@
#include "wx/module.h"
#include "wx/menuitem.h"
#include "wx/log.h"
#include "wx/univ/renderer.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
@ -837,15 +838,13 @@ void wxWindowX11::DoSetClientSize(int width, int height)
{
xwindow = (Window) m_clientWindow;
if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER))
wxWindow *window = (wxWindow*) this;
wxRenderer *renderer = window->GetRenderer();
if (renderer)
{
width -= 4;
height -= 4;
} else
if (HasFlag( wxSIMPLE_BORDER ))
{
width -= 2;
height -= 2;
wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
width -= border.x + border.width;
height -= border.y + border.height;
}
XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
@ -872,26 +871,22 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
{
xwindow = (Window) m_clientWindow;
if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER))
wxWindow *window = (wxWindow*) this;
wxRenderer *renderer = window->GetRenderer();
if (renderer)
{
x = 2;
y = 2;
width -= 4;
height -= 4;
} else
if (HasFlag( wxSIMPLE_BORDER ))
{
x = 1;
y = 1;
width -= 2;
height -= 2;
} else
wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
x = border.x;
y = border.y;
width -= border.x + border.width;
height -= border.y + border.height;
}
else
{
x = 0;
y = 0;
}
wxWindow *window = (wxWindow*) this;
wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
if (sb && sb->IsShown())
{
@ -1139,6 +1134,37 @@ void wxWindowX11::SendPaintEvents()
void wxWindowX11::SendNcPaintEvents()
{
wxWindow *window = (wxWindow*) this;
// All this for drawing the small square between the scrollbars.
int width = 0;
int height = 0;
int x = 0;
int y = 0;
wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
if (sb && sb->IsShown())
{
height = sb->GetSize().y;
y = sb->GetPosition().y;
sb = window->GetScrollbar( wxVERTICAL );
if (sb && sb->IsShown())
{
width = sb->GetSize().x;
x = sb->GetPosition().x;
Display *xdisplay = wxGlobalDisplay();
Window xwindow = (Window) GetMainWindow();
Colormap cm = (Colormap) wxTheApp->GetMainColormap( wxGetDisplay() );
wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
colour.CalcPixel( (WXColormap) cm );
XSetForeground( xdisplay, g_eraseGC, colour.GetPixel() );
XFillRectangle( xdisplay, xwindow, g_eraseGC, x, y, width, height );
}
}
wxNcPaintEvent nc_paint_event( GetId() );
nc_paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( nc_paint_event );