Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preparing wxHtmlWindow for text selection (highlighting works, mouse input and clipboard does not)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-05-31 21:48:50 +00:00
parent f65a786ffd
commit 36c4ff4d65
8 changed files with 186 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
src/html/htmlcell.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/html/htmlcell.h"
#include "wx/html/htmlwin.h"
#include "wx/settings.h"
#include <stdlib.h>
@@ -115,11 +116,14 @@ const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED
}
wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y) const
wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y,
unsigned flags) const
{
if ( x >= 0 && x < m_Width && y >= 0 && y < m_Height )
if ( (flags & wxHTML_FIND_TERMINAL) &&
x >= 0 && x < m_Width && y >= 0 && y < m_Height )
{
return wxConstCast(this, wxHtmlCell);
}
return NULL;
}
@@ -137,8 +141,27 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))
void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
wxHtmlRenderingState& state)
{
if (state.GetSelectionState() == wxHTML_SEL_IN &&
dc.GetBackgroundMode() != wxSOLID)
{
dc.SetBackgroundMode(wxSOLID);
dc.SetTextBackground(
wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
dc.SetTextForeground(
wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
}
else if (state.GetSelectionState() == wxHTML_SEL_OUT &&
dc.GetBackgroundMode() == wxSOLID)
{
dc.SetBackgroundMode(wxTRANSPARENT);
dc.SetTextForeground(state.GetFgColour());
dc.SetTextBackground(state.GetBgColour());
}
dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
}
@@ -401,11 +424,33 @@ void wxHtmlContainerCell::Layout(int w)
m_LastLayout = w;
}
void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingState& state,
wxHtmlCell *cell) const
{
wxHtmlSelection *s = state.GetSelection();
if (!s) return;
if (s->GetFromCell() == this || s->GetToCell() == this)
{
state.SetSelectionState(wxHTML_SEL_CHANGING);
}
}
void wxHtmlContainerCell::UpdateRenderingStatePost(wxHtmlRenderingState& state,
wxHtmlCell *cell) const
{
wxHtmlSelection *s = state.GetSelection();
if (!s) return;
if (s->GetFromCell() == this)
state.SetSelectionState(wxHTML_SEL_IN);
else if (s->GetToCell() == this)
state.SetSelectionState(wxHTML_SEL_OUT);
}
#define mMin(a, b) (((a) < (b)) ? (a) : (b))
#define mMax(a, b) (((a) < (b)) ? (b) : (a))
void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
wxHtmlRenderingState& state)
{
// container visible, draw it:
if ((y + m_PosY <= view_y2) && (y + m_PosY + m_Height > view_y1))
@@ -437,29 +482,37 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
if (m_Cells)
{
// draw container's contents:
for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
cell->Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2);
{
UpdateRenderingStatePre(state, cell);
cell->Draw(dc,
x + m_PosX, y + m_PosY, view_y1, view_y2,
state);
UpdateRenderingStatePost(state, cell);
}
}
}
// container invisible, just proceed font+color changing:
else
{
if (m_Cells)
{
for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
}
DrawInvisible(dc, x, y, state);
}
}
void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y)
void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y,
wxHtmlRenderingState& state)
{
if (m_Cells)
{
for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
{
UpdateRenderingStatePre(state, cell);
cell->DrawInvisible(dc, x + m_PosX, y + m_PosY, state);
UpdateRenderingStatePost(state, cell);
}
}
}
@@ -560,7 +613,8 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co
}
wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y) const
wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y,
unsigned flags) const
{
for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
{
@@ -570,11 +624,16 @@ wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y) const
if ( (cx <= x) && (cx + cell->GetWidth() > x) &&
(cy <= y) && (cy + cell->GetHeight() > y) )
{
return cell->FindCellByPos(x - cx, y - cy);
wxHtmlCell *c = cell->FindCellByPos(x - cx, y - cy, flags);
if (c == NULL && (flags & wxHTML_FIND_NONTERMINAL))
return wxConstCast(this, wxHtmlContainerCell);
else
return c;
}
}
return NULL;
return (flags & wxHTML_FIND_NONTERMINAL) ?
wxConstCast(this, wxHtmlContainerCell) : NULL;
}
@@ -614,45 +673,54 @@ void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const
//--------------------------------------------------------------------------------
// --------------------------------------------------------------------------
// wxHtmlColourCell
//--------------------------------------------------------------------------------
// --------------------------------------------------------------------------
void wxHtmlColourCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
void wxHtmlColourCell::Draw(wxDC& dc,
int x, int y,
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
wxHtmlRenderingState& state)
{
if (m_Flags & wxHTML_CLR_FOREGROUND)
dc.SetTextForeground(m_Colour);
if (m_Flags & wxHTML_CLR_BACKGROUND)
{
dc.SetBackground(wxBrush(m_Colour, wxSOLID));
dc.SetTextBackground(m_Colour);
}
DrawInvisible(dc, x, y, state);
}
void wxHtmlColourCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
void wxHtmlColourCell::DrawInvisible(wxDC& dc,
int WXUNUSED(x), int WXUNUSED(y),
wxHtmlRenderingState& state)
{
if (m_Flags & wxHTML_CLR_FOREGROUND)
dc.SetTextForeground(m_Colour);
{
state.SetFgColour(m_Colour);
if (state.GetSelectionState() != wxHTML_SEL_IN)
dc.SetTextForeground(m_Colour);
}
if (m_Flags & wxHTML_CLR_BACKGROUND)
{
state.SetBgColour(m_Colour);
if (state.GetSelectionState() != wxHTML_SEL_IN)
dc.SetTextBackground(m_Colour);
dc.SetBackground(wxBrush(m_Colour, wxSOLID));
dc.SetTextBackground(m_Colour);
}
}
//--------------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// wxHtmlFontCell
//--------------------------------------------------------------------------------
// ---------------------------------------------------------------------------
void wxHtmlFontCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
void wxHtmlFontCell::Draw(wxDC& dc,
int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
wxHtmlRenderingState& WXUNUSED(state))
{
dc.SetFont(m_Font);
}
void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y),
wxHtmlRenderingState& WXUNUSED(state))
{
dc.SetFont(m_Font);
}
@@ -664,9 +732,9 @@ void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
//--------------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// wxHtmlWidgetCell
//--------------------------------------------------------------------------------
// ---------------------------------------------------------------------------
wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
{
@@ -678,7 +746,10 @@ wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
}
void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc),
int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
wxHtmlRenderingState& WXUNUSED(state))
{
int absx = 0, absy = 0, stx, sty;
wxHtmlCell *c = this;
@@ -696,7 +767,9 @@ void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y)
void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y))
void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc),
int WXUNUSED(x), int WXUNUSED(y),
wxHtmlRenderingState& WXUNUSED(state))
{
int absx = 0, absy = 0, stx, sty;
wxHtmlCell *c = this;