{
// reverse sense
m_signX = -1;
-
+
// origin in the upper right corner
-
- int scroll_lines = 0;
- int scroll_step = 0;
-
- // Are we using scrolling?
- wxScrollHelper *sh = (wxScrollHelper*) m_owner->GetScrollHelper();
- if (sh)
- {
- scroll_lines = sh->GetScrollLines(wxHORIZONTAL);
- sh->GetScrollPixelsPerUnit( &scroll_step, NULL );
- }
-
- if (scroll_lines == 0)
- {
- int client_width = m_owner->GetClientSize().x;
- m_deviceOriginX = client_width;
- }
- else
- {
- // We cannot use just the virtual size here, because
- // the virtual size may be less than the visible area
- // due to rounding errors of the scroll steps. If the
- // horizontal scroll step is 10 pixels and the virtual
- // area is 97 pixels, we should be able to see or scroll
- // to 100 pixels, so the origin is at -100, not -97.
- int client_width = sh->GetTargetWindow()->GetClientSize().x;
- int virtual_size = m_owner->GetVirtualSize().x;
- int steps = (virtual_size + scroll_step - 1) / scroll_step;
- int width = steps * scroll_step + (client_width % scroll_step);
- m_deviceOriginX = width;
- }
+ m_deviceOriginX = m_owner->GetClientSize().x;
}
}
{
gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
- gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
- gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
+ if ((m_brush.GetStyle() != wxTRANSPARENT) && (alpha2 - alpha1 != 360*64))
+ {
+ gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
+ gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
+ }
}
}
}
if (m_pen.GetStyle() != wxTRANSPARENT)
- gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
+ {
+#if 1
+ if ((m_pen.GetWidth() == 2) && (m_pen.GetCap() == wxCAP_ROUND) &&
+ (m_pen.GetJoin() == wxJOIN_ROUND) && (m_pen.GetStyle() == wxSOLID))
+ {
+ // Use 2 1-line rects instead
+ gdk_gc_set_line_attributes( m_penGC, 1, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
+
+ if (m_signX == -1)
+ {
+ // Different for RTL
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx+1, yy, ww-2, hh-2 );
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy-1, ww, hh );
+ }
+ else
+ {
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-2, hh-2 );
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx-1, yy-1, ww, hh );
+ }
+
+ // reset
+ gdk_gc_set_line_attributes( m_penGC, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
+ }
+ else
+#endif
+ {
+ // Just use X11 for other cases
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
+ }
+ }
}
CalcBoundingBox( x, y );
xsrc = source->LogicalToDeviceX(xsrc);
ysrc = source->LogicalToDeviceY(ysrc);
- wxClientDC *srcDC = (wxClientDC*)source;
- wxMemoryDC *memDC = (wxMemoryDC*)source;
-
+ wxMemoryDC *memDC = wxDynamicCast(source, wxMemoryDC);
+ wxBitmap selected = source->GetSelectedBitmap();
+
bool use_bitmap_method = false;
bool is_mono = false;
ysrcMask = ysrc;
}
- if (srcDC->m_isMemDC)
+ if (memDC && !selected.Ok()) return false;
+
+ if (selected.Ok())
{
- if (!memDC->m_selected.Ok()) return false;
-
- is_mono = (memDC->m_selected.GetDepth() == 1);
+ is_mono = (selected.GetDepth() == 1);
// we use the "XCopyArea" way to copy a memory dc into
// a different window if the memory dc BOTH
// b) it is clipped
// c) is not 1-bit
- if (useMask && (memDC->m_selected.GetMask()))
+ if (useMask && (selected.GetMask()))
{
// we HAVE TO use the direct way for memory dcs
// that have mask since the XCopyArea doesn't know
use_bitmap_method = true;
}
else if ((xsrc == 0) && (ysrc == 0) &&
- (width == memDC->m_selected.GetWidth()) &&
- (height == memDC->m_selected.GetHeight()))
+ (width == selected.GetWidth()) &&
+ (height == selected.GetHeight()))
{
// we SHOULD use the direct way if all of the bitmap
// in the memory dc is copied in which case XCopyArea
if (use_bitmap_method)
{
// scale/translate bitmap size
- wxCoord bm_width = memDC->m_selected.GetWidth();
- wxCoord bm_height = memDC->m_selected.GetHeight();
+ wxCoord bm_width = selected.GetWidth();
+ wxCoord bm_height = selected.GetHeight();
// Get clip coords for the bitmap. If we don't
// use wxBitmap::Rescale(), which can clip the
wxCoord bm_hh = YLOG2DEVREL( bm_height );
// Scale bitmap if required
- wxBitmap use_bitmap = memDC->m_selected;
- if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))
+ wxBitmap use_bitmap = selected;
+ if ((selected.GetWidth()!= bm_ww) || ( selected.GetHeight()!= bm_hh))
{
// This indicates that the blitting code below will get
// a clipped bitmap and therefore needs to move the origin
tmp.GetBox(cx,cy,cw,ch);
// Scale and clipped bitmap
- use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
+ use_bitmap = selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
}
// apply mask if any
}
else // use_bitmap_method
{
- if ((width != ww) || (height != hh))
+ if (selected.Ok() && ((width != ww) || (height != hh)))
{
// get clip coords
wxRegion tmp( xx,yy,ww,hh );
tmp.GetBox(cx,cy,cw,ch);
// rescale bitmap
- wxBitmap bitmap = memDC->m_selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
+ wxBitmap bitmap = selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
// draw scaled bitmap
// was: gdk_draw_drawable( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
{
// No scaling and not a memory dc with a mask either
+ GdkWindow* window = source->GetGDKWindow();
+ if ( !window )
+ return false;
+
// copy including child window contents
gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
gdk_draw_drawable( m_window, m_penGC,
- srcDC->GetWindow(),
+ window,
xsrc, ysrc, xx, yy,
width, height );
gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
wxCHECK_RET( m_layout, wxT("no Pango layout") );
wxCHECK_RET( m_fontdesc, wxT("no Pango font description") );
+ gdk_pango_context_set_colormap( m_context, m_cmap );
+
bool underlined = m_font.Ok() && m_font.GetUnderlined();
const wxCharBuffer data = wxGTK_CONV( text );
if ( !data )
return;
- const size_t datalen = strlen(data);
- pango_layout_set_text( m_layout, data, datalen);
+ size_t datalen = strlen(data);
+
+ // TODO: as soon as Pango provides a function to check at runtime its
+ // version, we can use it to disable the underline hack for
+ // Pango >= 1.16 as the "underline of leading/trailing spaces"
+ // has been fixed there
+ bool needshack = underlined;
+ char *hackstring = NULL;
+
+ if (needshack)
+ {
+ // a PangoLayout which has leading/trailing spaces with underlined font
+ // is not correctly drawn by this pango version: Pango won't underline the spaces.
+ // This can be a problem; e.g. wxHTML rendering of underlined text relies on
+ // this behaviour. To workaround this problem, we use a special hack here
+ // suggested by pango maintainer Behdad Esfahbod: we prepend and append two
+ // empty space characters and give them a dummy colour attribute.
+ // This will force Pango to underline the leading/trailing spaces, too.
+
+ // need to realloc the string to prepend & append our special characters
+ hackstring = (char*)malloc((datalen+7)*sizeof(char));
+
+ // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
+ strcpy(hackstring, "\342\200\214");
+
+ // copy the user string
+ memcpy(&hackstring[3], data, datalen);
+
+ // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
+ strcpy(&hackstring[datalen+3], "\342\200\214");
+
+ // the special characters that we added require 6 additional bytes:
+ datalen += 6;
+
+ pango_layout_set_text(m_layout, hackstring, datalen);
+ }
+ else
+ {
+ pango_layout_set_text(m_layout, data, datalen);
+ }
if (underlined)
{
a->start_index = 0;
a->end_index = datalen;
pango_attr_list_insert(attrs, a);
+
+ if (needshack)
+ {
+ // dummy colour for the leading space
+ a = pango_attr_foreground_new (0x0057, 0x52A9, 0xD614);
+ a->start_index = 0;
+ a->end_index = 1;
+ pango_attr_list_insert(attrs, a);
+
+ // dummy colour for the trailing space
+ a = pango_attr_foreground_new (0x0057, 0x52A9, 0xD614);
+ a->start_index = datalen - 1;
+ a->end_index = datalen;
+ pango_attr_list_insert(attrs, a);
+ }
+
pango_layout_set_attributes(m_layout, attrs);
pango_attr_list_unref(attrs);
}
height = wxCoord(height / m_scaleY);
CalcBoundingBox (x + width, y + height);
CalcBoundingBox (x, y);
+
+ if (hackstring)
+ free(hackstring);
}
return;
wxSize sz = win->GetSize();
- m_paintClippingRegion = win->GetUpdateRegion();
+ m_paintClippingRegion = win->m_nativeUpdateRegion;
wxLimitRegionToSize(m_paintClippingRegion, sz);
GdkRegion *region = m_paintClippingRegion.GetRegion();
projects / wxWidgets.git / blobdiff