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

Bitmaps are no longer rescaled to reflect printerPPI/screenPPI ratio. Instead, we change user scale before drawing them and then restore it back.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-01-17 00:31:58 +00:00
parent adb85931ab
commit b5c01940ac
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/html/m_image.cpp
View File

@@ -272,6 +272,7 @@ class wxHtmlImageCell : public wxHtmlCell
{ {
public: public:
wxBitmap *m_Image; wxBitmap *m_Image;
double m_Scale;
wxHtmlImageMapCell *m_ImageMap; wxHtmlImageMapCell *m_ImageMap;
wxString m_MapName; wxString m_MapName;
@@ -291,25 +292,25 @@ class wxHtmlImageCell : public wxHtmlCell
wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, double scale, 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, bw, bh;
wxInputStream *s = input->GetStream(); wxInputStream *s = input->GetStream();
m_Scale = scale;
img = new wxImage(*s, wxBITMAP_TYPE_ANY); img = new wxImage(*s, wxBITMAP_TYPE_ANY);
m_Image = NULL; m_Image = NULL;
if (img && (img->Ok())) if (img && (img->Ok()))
{ {
ww = img->GetWidth(); ww = img->GetWidth();
hh = img->GetHeight(); hh = img->GetHeight();
if (w != -1) m_Width = w; else m_Width = ww; if (w != -1) bw = w; else bw = ww;
if (h != -1) m_Height = h; else m_Height = hh; if (h != -1) bh = h; else bh = hh;
m_Width = (int)(scale * (double)m_Width); m_Width = (int)(scale * (double)bw);
m_Height = (int)(scale * (double)m_Height); m_Height = (int)(scale * (double)bh);
if ((m_Width != ww) || (m_Height != hh)) if ((bw != ww) || (bh != hh))
{ {
wxImage img2 = img->Scale(m_Width, m_Height); wxImage img2 = img->Scale(bw, bh);
m_Image = new wxBitmap(img2.ConvertToBitmap()); m_Image = new wxBitmap(img2.ConvertToBitmap());
} }
else else
@@ -340,8 +341,16 @@ wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, double scale, in
void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{ {
if (m_Image) if (m_Image)
// dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, (m_Image->GetMask() != (wxMask*) 0)); {
dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, TRUE); double us_x, us_y;
dc.GetUserScale(&us_x, &us_y);
dc.SetUserScale(us_x * m_Scale, us_y * m_Scale);
// dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, (m_Image->GetMask() != (wxMask*) 0));
dc.DrawBitmap(*m_Image, (x + m_PosX) / m_Scale,
(y + m_PosY) / m_Scale, TRUE);
dc.SetUserScale(us_x, us_y);
}
wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
} }