forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux scrollbars

This commit is contained in:
Adam D. Ruppe 2017-04-05 11:40:40 -04:00
parent 7ac954a3fa
commit c60535deca
2 changed files with 714 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

715
minigui.d
View File

File diff suppressed because it is too large Load Diff

52
simpledisplay.d
View File

@ -1774,6 +1774,9 @@ class SimpleWindow : CapableOfHandlingNativeEvent {
* WARNING! Xlib is multithread-locked when this handles is called! */ * WARNING! Xlib is multithread-locked when this handles is called! */
bool delegate(int x, int y, int width, int height, int eventsLeft) handleExpose; bool delegate(int x, int y, int width, int height, int eventsLeft) handleExpose;
//version(Windows)
//bool delegate(WPARAM wParam, LPARAM lParam) handleWM_PAINT;
private { private {
int lastMouseX = int.min; int lastMouseX = int.min;
int lastMouseY = int.min; int lastMouseY = int.min;
@ -3709,7 +3712,8 @@ struct Pen {
/// Style of lines drawn /// Style of lines drawn
enum Style { enum Style {
Solid, /// a solid line Solid, /// a solid line
Dashed /// a dashed line Dashed, /// a dashed line
Dotted, /// a dotted line
} }
} }
@ -4136,14 +4140,17 @@ struct ScreenPainter {
// writeln("constructed"); // writeln("constructed");
} }
originalPen = impl._activePen; copyActiveOriginals();
originalFillColor = impl._fillColor;
originalClipRectangle = impl._clipRectangle;
} }
private Pen originalPen; private Pen originalPen;
private Color originalFillColor; private Color originalFillColor;
private arsd.color.Rectangle originalClipRectangle; private arsd.color.Rectangle originalClipRectangle;
void copyActiveOriginals() {
originalPen = impl._activePen;
originalFillColor = impl._fillColor;
originalClipRectangle = impl._clipRectangle;
}
~this() { ~this() {
impl.referenceCount--; impl.referenceCount--;
@ -4152,6 +4159,7 @@ struct ScreenPainter {
//writeln("destructed"); //writeln("destructed");
impl.dispose(); impl.dispose();
window.activeScreenPainter = null; window.activeScreenPainter = null;
//import std.stdio; writeln("paint finished");
} else { } else {
// there is still an active reference, reset stuff so the // there is still an active reference, reset stuff so the
// next user doesn't get weirdness via the reference // next user doesn't get weirdness via the reference
@ -4165,6 +4173,8 @@ struct ScreenPainter {
this(this) { this(this) {
impl.referenceCount++; impl.referenceCount++;
//writeln("refcount ++ ", impl.referenceCount); //writeln("refcount ++ ", impl.referenceCount);
copyActiveOriginals();
} }
/// Sets the clipping region for drawing. If width == 0 && height == 0, disabled clipping. /// Sets the clipping region for drawing. If width == 0 && height == 0, disabled clipping.
@ -5286,6 +5296,9 @@ version(Windows) {
case Pen.Style.Dashed: case Pen.Style.Dashed:
style = PS_DASH; style = PS_DASH;
break; break;
case Pen.Style.Dotted:
style = PS_DOT;
break;
} }
pen = CreatePen(style, p.width, RGB(p.color.r, p.color.g, p.color.b)); pen = CreatePen(style, p.width, RGB(p.color.r, p.color.g, p.color.b));
} }
@ -6328,16 +6341,25 @@ version(X11) {
int style; int style;
byte dashLength;
final switch(p.style) { final switch(p.style) {
case Pen.Style.Solid: case Pen.Style.Solid:
style = 0 /*LineSolid*/; style = 0 /*LineSolid*/;
break; break;
case Pen.Style.Dashed: case Pen.Style.Dashed:
style = 1 /*LineOnOffDash*/; style = 1 /*LineOnOffDash*/;
dashLength = 4;
break;
case Pen.Style.Dotted:
style = 1 /*LineOnOffDash*/;
dashLength = 1;
break; break;
} }
XSetLineAttributes(display, gc, p.width, style, 0, 0); XSetLineAttributes(display, gc, p.width, style, 0, 0);
if(dashLength)
XSetDashes(display, gc, 0, &dashLength, 1);
if(p.color.a == 0) { if(p.color.a == 0) {
foregroundIsNotTransparent = false; foregroundIsNotTransparent = false;
@ -8453,7 +8475,7 @@ struct XFontStruct {
int XTextWidth(XFontStruct*, in char*, int); int XTextWidth(XFontStruct*, in char*, int);
int XSetLineAttributes(Display *display, GC gc, uint line_width, int line_style, int cap_style, int join_style); int XSetLineAttributes(Display *display, GC gc, uint line_width, int line_style, int cap_style, int join_style);
int XSetDashes(Display *display, GC gc, int dash_offset, in char* dash_list, int n); int XSetDashes(Display *display, GC gc, int dash_offset, in byte* dash_list, int n);
@ -10843,6 +10865,18 @@ mixin template ExperimentalTextComponent() {
BlockElement[] blocks; BlockElement[] blocks;
Rectangle boundingBox; Rectangle boundingBox;
Rectangle contentBoundingBox() {
Rectangle r;
foreach(block; blocks)
foreach(ie; block.parts) {
if(ie.boundingBox.right > r.right)
r.right = ie.boundingBox.right;
if(ie.boundingBox.bottom > r.bottom)
r.bottom = ie.boundingBox.bottom;
}
return r;
}
BlockElement[] getBlocks() { BlockElement[] getBlocks() {
return blocks; return blocks;
} }
@ -10996,8 +11030,10 @@ mixin template ExperimentalTextComponent() {
carat.offset = result.offset; carat.offset = result.offset;
} }
// FIXME: carat can remain sometimes when inserting
// FIXME: inserting at the beginning once you already have something can eff it up.
void drawInto(ScreenPainter painter, bool focused = false) { void drawInto(ScreenPainter painter, bool focused = false) {
painter.setClipRectangle(boundingBox); //painter.setClipRectangle(boundingBox);
auto pos = Point(boundingBox.left, boundingBox.top); auto pos = Point(boundingBox.left, boundingBox.top);
int lastHeight; int lastHeight;
@ -11059,7 +11095,7 @@ mixin template ExperimentalTextComponent() {
int caratLastDrawnX, caratLastDrawnY1, caratLastDrawnY2; int caratLastDrawnX, caratLastDrawnY1, caratLastDrawnY2;
bool caratShowingOnScreen = false; bool caratShowingOnScreen = false;
void drawCarat(ScreenPainter painter) { void drawCarat(ScreenPainter painter) {
painter.setClipRectangle(boundingBox); //painter.setClipRectangle(boundingBox);
int x, y1, y2; int x, y1, y2;
if(carat.inlineElement is null) { if(carat.inlineElement is null) {
x = boundingBox.left; x = boundingBox.left;
@ -11091,7 +11127,7 @@ mixin template ExperimentalTextComponent() {
} }
void eraseCarat(ScreenPainter painter) { void eraseCarat(ScreenPainter painter) {
painter.setClipRectangle(boundingBox); //painter.setClipRectangle(boundingBox);
if(!caratShowingOnScreen) return; if(!caratShowingOnScreen) return;
painter.pen = Pen(Color.white, 1); painter.pen = Pen(Color.white, 1);
painter.rasterOp = RasterOp.xor; painter.rasterOp = RasterOp.xor;