X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/752cd08c659c7393bacbfe4305760f4ee58a8255..70f2e88c6b16abd31645049db8d6d76540fcd3de:/src/stc/ScintillaWX.cpp diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 50bfac2f18..f1c0e43a0a 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -19,13 +19,6 @@ #include "wx/stc/stc.h" #include "PlatWX.h" - -//---------------------------------------------------------------------- - -const int H_SCROLL_MAX = 4000; -const int H_SCROLL_STEP = 20; -const int H_SCROLL_PAGE = 200; - //---------------------------------------------------------------------- // Helper classes @@ -63,6 +56,11 @@ void wxSTCDropTarget::OnLeave() { #endif +#ifdef __WXGTK__ +#undef wxSTC_USE_POPUP +#define wxSTC_USE_POPUP 0 +#endif + #if wxUSE_POPUPWIN && wxSTC_USE_POPUP #include #define wxSTCCallTipBase wxPopupWindow @@ -80,6 +78,10 @@ public: m_ct = ct; } + ~wxSTCCallTip() { + if (HasCapture()) ReleaseMouse(); + } + void OnPaint(wxPaintEvent& evt) { wxPaintDC dc(this); Surface* surfaceWindow = Surface::Allocate(); @@ -106,12 +108,10 @@ public: virtual bool Show( bool show = TRUE ) { bool retval = wxSTCCallTipBase::Show(show); - if (show) { + if (show) CaptureMouse(); - } - else { + else if (HasCapture()) ReleaseMouse(); - } return retval; } @@ -258,16 +258,18 @@ void ScintillaWX::SetHorizontalScrollPos() { } } +const int H_SCROLL_STEP = 20; bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) { bool modified = false; + // Check the vertical scrollbar if (stc->m_vScrollBar == NULL) { // Use built-in scrollbar int sbMax = stc->GetScrollRange(wxVERTICAL); int sbThumb = stc->GetScrollThumb(wxVERTICAL); int sbPos = stc->GetScrollPos(wxVERTICAL); if (sbMax != nMax || sbThumb != nPage) { - stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax); + stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax+1); modified = true; } } @@ -276,30 +278,46 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) { int sbPage = stc->m_vScrollBar->GetPageSize(); int sbPos = stc->m_vScrollBar->GetThumbPosition(); if (sbMax != nMax || sbPage != nPage) { - stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax, nPage); + stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax+1, nPage); modified = true; } } - if (horizontalScrollBarVisible) { - if (stc->m_hScrollBar == NULL) { // Use built-in scrollbar - int sbMax = stc->GetScrollRange(wxHORIZONTAL); - int sbThumb = stc->GetScrollThumb(wxHORIZONTAL); - if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) { - stc->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX); - modified = true; + // Check the horizontal scrollbar + PRectangle rcText = GetTextRectangle(); + int horizEnd = scrollWidth; + if (horizEnd < 0) + horizEnd = 0; + if (!horizontalScrollBarVisible || (wrapState != eWrapNone)) + horizEnd = 0; + int pageWidth = rcText.Width(); + + if (stc->m_hScrollBar == NULL) { // Use built-in scrollbar + int sbMax = stc->GetScrollRange(wxHORIZONTAL); + int sbThumb = stc->GetScrollThumb(wxHORIZONTAL); + int sbPos = stc->GetScrollPos(wxHORIZONTAL); + if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) { + stc->SetScrollbar(wxHORIZONTAL, 0, pageWidth, horizEnd); + modified = true; + if (scrollWidth < pageWidth) { + HorizontalScrollTo(0); } } - else { // otherwise use the one that's been given to us - int sbMax = stc->m_hScrollBar->GetRange(); - int sbPage = stc->m_hScrollBar->GetPageSize(); - if ((sbMax != H_SCROLL_MAX) || (sbPage != H_SCROLL_STEP)) { - stc->m_hScrollBar->SetScrollbar(0, H_SCROLL_STEP, H_SCROLL_MAX, H_SCROLL_STEP); - modified = true; + } + else { // otherwise use the one that's been given to us + int sbMax = stc->m_hScrollBar->GetRange(); + int sbThumb = stc->m_hScrollBar->GetPageSize(); + int sbPos = stc->m_hScrollBar->GetThumbPosition(); + if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) { + stc->m_hScrollBar->SetScrollbar(0, pageWidth, horizEnd, pageWidth); + modified = true; + if (scrollWidth < pageWidth) { + HorizontalScrollTo(0); } } } + return modified; } @@ -319,11 +337,12 @@ void ScintillaWX::Copy() { if (currentPos != anchor) { SelectionText st; CopySelectionRange(&st); - wxTheClipboard->Open(); - wxTheClipboard->UsePrimarySelection(); - wxString text = stc2wx(st.s, st.len); - wxTheClipboard->SetData(new wxTextDataObject(text)); - wxTheClipboard->Close(); + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(); + wxString text = stc2wx(st.s, st.len); + wxTheClipboard->SetData(new wxTextDataObject(text)); + wxTheClipboard->Close(); + } } } @@ -333,12 +352,13 @@ void ScintillaWX::Paste() { ClearSelection(); wxTextDataObject data; - bool gotData; + bool gotData = FALSE; - wxTheClipboard->Open(); - wxTheClipboard->UsePrimarySelection(); - gotData = wxTheClipboard->GetData(data); - wxTheClipboard->Close(); + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(); + gotData = wxTheClipboard->GetData(data); + wxTheClipboard->Close(); + } if (gotData) { wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText()); int len = strlen(buf); @@ -353,13 +373,18 @@ void ScintillaWX::Paste() { bool ScintillaWX::CanPaste() { - bool canPaste; + bool canPaste = FALSE; + bool didOpen; - wxTheClipboard->Open(); - wxTheClipboard->UsePrimarySelection(); - canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); - wxTheClipboard->Close(); + if ( (didOpen = !wxTheClipboard->IsOpened()) ) + wxTheClipboard->Open(); + if (wxTheClipboard->IsOpened()) { + wxTheClipboard->UsePrimarySelection(); + canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); + if (didOpen) + wxTheClipboard->Close(); + } return canPaste; } @@ -429,18 +454,24 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) { void ScintillaWX::DoHScroll(int type, int pos) { int xPos = xOffset; + PRectangle rcText = GetTextRectangle(); + int pageWidth = rcText.Width() * 2 / 3; if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP) xPos -= H_SCROLL_STEP; else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN) xPos += H_SCROLL_STEP; else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP) - xPos -= H_SCROLL_PAGE; - else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) - xPos += H_SCROLL_PAGE; + xPos -= pageWidth; + else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) { + xPos += pageWidth; + if (xPos > scrollWidth - rcText.Width()) { + xPos = scrollWidth - rcText.Width(); + } + } else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP) xPos = 0; else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM) - xPos = H_SCROLL_MAX; + xPos = scrollWidth; else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK) xPos = pos; @@ -467,8 +498,9 @@ void ScintillaWX::DoVScroll(int type, int pos) { ScrollTo(topLineNew); } - -void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown) { +void ScintillaWX::DoMouseWheel(int rotation, int delta, + int linesPerAction, int ctrlDown, + bool isPageScroll ) { int topLineNew = topLine; int lines; @@ -485,7 +517,10 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int lines = wheelRotation / delta; wheelRotation -= lines * delta; if (lines != 0) { - lines *= linesPerAction; + if (isPageScroll) + lines = lines * LinesOnScreen(); // lines is either +1 or -1 + else + lines *= linesPerAction; topLineNew -= lines; ScrollTo(topLineNew); }