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

fixed bug in scaling images

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-02-11 12:08:23 +00:00
parent 6d004f675d
commit 37a1f3f69b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/html/m_image.cpp
View File

@@ -249,7 +249,7 @@ class wxHtmlImageCell : public wxHtmlCell
wxHtmlImageMapCell *m_ImageMap; wxHtmlImageMapCell *m_ImageMap;
wxString m_MapName; wxString m_MapName;
wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, int align = wxHTML_ALIGN_BOTTOM, wxString mapname = wxEmptyString); wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, wxString mapname = wxEmptyString);
~wxHtmlImageCell() {if (m_Image) delete m_Image; } ~wxHtmlImageCell() {if (m_Image) delete m_Image; }
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const; virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
@@ -262,7 +262,7 @@ class wxHtmlImageCell : public wxHtmlCell
// wxHtmlImageCell // wxHtmlImageCell
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxString mapname) : wxHtmlCell() wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, double scale, int align, wxString mapname) : wxHtmlCell()
{ {
wxImage *img; wxImage *img;
int ww, hh; int ww, hh;
@@ -276,6 +276,10 @@ wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxStr
hh = img -> GetHeight(); hh = img -> GetHeight();
if (w != -1) m_Width = w; else m_Width = ww; if (w != -1) m_Width = w; else m_Width = ww;
if (h != -1) m_Height = h; else m_Height = hh; if (h != -1) m_Height = h; else m_Height = hh;
m_Width = (int)(scale * (double)w);
m_Height = (int)(scale * (double)h);
if ((m_Width != ww) || (m_Height != hh)) { if ((m_Width != ww) || (m_Height != hh)) {
wxImage img2 = img -> Scale(m_Width, m_Height); wxImage img2 = img -> Scale(m_Width, m_Height);
m_Image = new wxBitmap(img2.ConvertToBitmap()); m_Image = new wxBitmap(img2.ConvertToBitmap());
@@ -373,10 +377,7 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
} }
wxHtmlImageCell *cel = NULL; wxHtmlImageCell *cel = NULL;
if (str) { if (str) {
int neww = (w == -1) ? -1 : (int)(m_WParser -> GetPixelScale() * (double)w), cel = new wxHtmlImageCell(str, w, h, m_WParser -> GetPixelScale(), al, mn);
newh = (h == -1) ? -1 : (int)(m_WParser -> GetPixelScale() * (double)h);
cel = new wxHtmlImageCell(str, neww, newh, al, mn);
cel -> SetLink(m_WParser -> GetLink()); cel -> SetLink(m_WParser -> GetLink());
m_WParser -> GetContainer() -> InsertCell(cel); m_WParser -> GetContainer() -> InsertCell(cel);
delete str; delete str;