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

some dpi scaling bugs

This commit is contained in:
Adam D. Ruppe 2022-01-12 17:22:56 -05:00
parent 06a8543bcb
commit 40a5854003
3 changed files with 176 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -148,7 +148,7 @@
}, },
{ {
"name": "image_files", "name": "image_files",
"description": "Various image file format support - PNG read/write, JPEG, TGA, BMP, PCX, TGA, DDS read.", "description": "Various image file format support - PNG read/write, JPEG, TGA, BMP, PCX, TGA, DDS read and SVG rasterization.",
"importPaths": ["."], "importPaths": ["."],
"targetType": "library", "targetType": "library",
"dependencies": { "dependencies": {

229
minigui.d
View File

@ -575,7 +575,8 @@ class Widget : ReflectableProperties {
Scales the given value to the system-reported DPI for the monitor on which the widget resides. Scales the given value to the system-reported DPI for the monitor on which the widget resides.
History: History:
Added November 25, 2021 Added November 25, 2021 (dub v10.5)
`Point` overload added January 12, 2022 (dub v10.6)
+/ +/
int scaleWithDpi(int value, int assumedDpi = 96) { int scaleWithDpi(int value, int assumedDpi = 96) {
// avoid potential overflow with common special values // avoid potential overflow with common special values
@ -587,6 +588,7 @@ class Widget : ReflectableProperties {
return 0; return 0;
auto divide = (parentWindow && parentWindow.win) ? parentWindow.win.actualDpi : assumedDpi; auto divide = (parentWindow && parentWindow.win) ? parentWindow.win.actualDpi : assumedDpi;
//divide = 138;
// for lower values it is something i don't really want changed anyway since it is an old monitor and you don't want to scale down. // for lower values it is something i don't really want changed anyway since it is an old monitor and you don't want to scale down.
// this also covers the case when actualDpi returns 0. // this also covers the case when actualDpi returns 0.
if(divide < 96) if(divide < 96)
@ -594,6 +596,11 @@ class Widget : ReflectableProperties {
return value * divide / assumedDpi; return value * divide / assumedDpi;
} }
/// ditto
Point scaleWithDpi(Point value, int assumedDpi = 96) {
return Point(scaleWithDpi(value.x, assumedDpi), scaleWithDpi(value.y, assumedDpi));
}
// avoid this it just forwards to a soon-to-be-deprecated function and is not remotely stable // avoid this it just forwards to a soon-to-be-deprecated function and is not remotely stable
// I'll think up something better eventually // I'll think up something better eventually
protected final int defaultLineHeight() { protected final int defaultLineHeight() {
@ -612,6 +619,22 @@ class Widget : ReflectableProperties {
return false; return false;
} }
private void privateDpiChanged() {
dpiChanged();
foreach(child; children)
child.privateDpiChanged();
}
/++
Virtual hook to update any caches or fonts you need on the event of a dpi scaling change.
History:
Added January 12, 2022 (dub v10.6)
+/
protected void dpiChanged() {
}
// Default layout properties { // Default layout properties {
int minWidth() { return 0; } int minWidth() { return 0; }
@ -4390,27 +4413,27 @@ class ScrollableWidget : Widget {
break; break;
case SB_LINEDOWN: case SB_LINEDOWN:
if(msg == WM_HSCROLL) if(msg == WM_HSCROLL)
horizontalScroll(16); horizontalScroll(scaleWithDpi(16));
else else
verticalScroll(16); verticalScroll(scaleWithDpi(16));
break; break;
case SB_LINEUP: case SB_LINEUP:
if(msg == WM_HSCROLL) if(msg == WM_HSCROLL)
horizontalScroll(-16); horizontalScroll(scaleWithDpi(-16));
else else
verticalScroll(-16); verticalScroll(scaleWithDpi(-16));
break; break;
case SB_PAGEDOWN: case SB_PAGEDOWN:
if(msg == WM_HSCROLL) if(msg == WM_HSCROLL)
horizontalScroll(100); horizontalScroll(scaleWithDpi(100));
else else
verticalScroll(100); verticalScroll(scaleWithDpi(100));
break; break;
case SB_PAGEUP: case SB_PAGEUP:
if(msg == WM_HSCROLL) if(msg == WM_HSCROLL)
horizontalScroll(-100); horizontalScroll(scaleWithDpi(-100));
else else
verticalScroll(-100); verticalScroll(scaleWithDpi(-100));
break; break;
case SB_THUMBPOSITION: case SB_THUMBPOSITION:
case SB_THUMBTRACK: case SB_THUMBTRACK:
@ -4456,25 +4479,25 @@ class ScrollableWidget : Widget {
override void defaultEventHandler_click(ClickEvent event) { override void defaultEventHandler_click(ClickEvent event) {
if(event.button == MouseButton.wheelUp) if(event.button == MouseButton.wheelUp)
verticalScroll(-16); verticalScroll(scaleWithDpi(-16));
if(event.button == MouseButton.wheelDown) if(event.button == MouseButton.wheelDown)
verticalScroll(16); verticalScroll(scaleWithDpi(16));
super.defaultEventHandler_click(event); super.defaultEventHandler_click(event);
} }
override void defaultEventHandler_keydown(KeyDownEvent event) { override void defaultEventHandler_keydown(KeyDownEvent event) {
switch(event.key) { switch(event.key) {
case Key.Left: case Key.Left:
horizontalScroll(-16); horizontalScroll(scaleWithDpi(-16));
break; break;
case Key.Right: case Key.Right:
horizontalScroll(16); horizontalScroll(scaleWithDpi(16));
break; break;
case Key.Up: case Key.Up:
verticalScroll(-16); verticalScroll(scaleWithDpi(-16));
break; break;
case Key.Down: case Key.Down:
verticalScroll(16); verticalScroll(scaleWithDpi(16));
break; break;
case Key.Home: case Key.Home:
verticalScrollTo(0); verticalScrollTo(0);
@ -4483,10 +4506,10 @@ class ScrollableWidget : Widget {
verticalScrollTo(contentHeight); verticalScrollTo(contentHeight);
break; break;
case Key.PageUp: case Key.PageUp:
verticalScroll(-160); verticalScroll(scaleWithDpi(-160));
break; break;
case Key.PageDown: case Key.PageDown:
verticalScroll(160); verticalScroll(scaleWithDpi(160));
break; break;
default: default:
} }
@ -4535,11 +4558,11 @@ class ScrollableWidget : Widget {
/// ///
final @property int viewportWidth() { final @property int viewportWidth() {
return width - (showingVerticalScroll ? 16 : 0); return width - (showingVerticalScroll ? scaleWithDpi(16) : 0);
} }
/// ///
final @property int viewportHeight() { final @property int viewportHeight() {
return height - (showingHorizontalScroll ? 16 : 0); return height - (showingHorizontalScroll ? scaleWithDpi(16) : 0);
} }
// FIXME property // FIXME property
@ -4687,8 +4710,8 @@ class ScrollableWidget : Widget {
} }
// make space for the scroll bar, and that's it. // make space for the scroll bar, and that's it.
final override int paddingRight() { return 16; } final override int paddingRight() { return scaleWithDpi(16); }
final override int paddingBottom() { return 16; } final override int paddingBottom() { return scaleWithDpi(16); }
/* /*
END SCROLLING END SCROLLING
@ -4860,10 +4883,10 @@ class ScrollableContainerWidget : ContainerWidget {
vsb.addEventListener("scrolltonextline", () { vsb.addEventListener("scrolltonextline", () {
scrollBy(0, 16); scrollBy(0, scaleWithDpi(16));
}); });
vsb.addEventListener("scrolltopreviousline", () { vsb.addEventListener("scrolltopreviousline", () {
scrollBy(0, -16); scrollBy(0,scaleWithDpi( -16));
}); });
vsb.addEventListener("scrolltonextpage", () { vsb.addEventListener("scrolltonextpage", () {
scrollBy(0, container.height); scrollBy(0, container.height);
@ -4878,11 +4901,11 @@ class ScrollableContainerWidget : ContainerWidget {
this.addEventListener(delegate (scope ClickEvent e) { this.addEventListener(delegate (scope ClickEvent e) {
if(e.button == MouseButton.wheelUp) { if(e.button == MouseButton.wheelUp) {
if(!e.defaultPrevented) if(!e.defaultPrevented)
scrollBy(0, -16); scrollBy(0, scaleWithDpi(-16));
e.stopPropagation(); e.stopPropagation();
} else if(e.button == MouseButton.wheelDown) { } else if(e.button == MouseButton.wheelDown) {
if(!e.defaultPrevented) if(!e.defaultPrevented)
scrollBy(0, 16); scrollBy(0, scaleWithDpi(16));
e.stopPropagation(); e.stopPropagation();
} }
}); });
@ -4973,16 +4996,16 @@ class ScrollableContainerWidget : ContainerWidget {
registerMovement(); registerMovement();
hsb.height = 16; // FIXME? are tese 16s sane? hsb.height = scaleWithDpi(16); // FIXME? are tese 16s sane?
hsb.x = 0; hsb.x = 0;
hsb.y = this.height - hsb.height; hsb.y = this.height - hsb.height;
hsb.width = this.width - 16; hsb.width = this.width - scaleWithDpi(16);
hsb.recomputeChildLayout(); hsb.recomputeChildLayout();
vsb.width = 16; // FIXME? vsb.width = scaleWithDpi(16); // FIXME?
vsb.x = this.width - vsb.width; vsb.x = this.width - vsb.width;
vsb.y = 0; vsb.y = 0;
vsb.height = this.height - 16; vsb.height = this.height - scaleWithDpi(16);
vsb.recomputeChildLayout(); vsb.recomputeChildLayout();
container.x = 0; container.x = 0;
@ -5014,7 +5037,7 @@ class ScrollableContainerWidget : ContainerWidget {
setViewableArea(width, height); setViewableArea(width, height);
} }
override int minHeight() { return 64; } override int minHeight() { return scaleWithDpi(64); }
HorizontalScrollbar hsb; HorizontalScrollbar hsb;
VerticalScrollbar vsb; VerticalScrollbar vsb;
@ -5407,10 +5430,10 @@ class VerticalSlider : Slider {
thumb.tabStop = false; thumb.tabStop = false;
thumb.thumbWidth = width; thumb.thumbWidth = width;
thumb.thumbHeight = 16; thumb.thumbHeight = scaleWithDpi(16);
thumb.addEventListener(EventType.change, () { thumb.addEventListener(EventType.change, () {
auto sx = thumb.positionY * max() / (thumb.height - 16); auto sx = thumb.positionY * max() / (thumb.height - scaleWithDpi(16));
sx = max - sx; sx = max - sx;
//informProgramThatUserChangedPosition(sx); //informProgramThatUserChangedPosition(sx);
@ -5430,7 +5453,7 @@ class VerticalSlider : Slider {
version(custom_widgets) version(custom_widgets)
protected override void setPositionCustom(int a) { protected override void setPositionCustom(int a) {
if(max()) if(max())
thumb.positionY = (max - a) * (thumb.height - 16) / max(); thumb.positionY = (max - a) * (thumb.height - scaleWithDpi(16)) / max();
redraw(); redraw();
} }
} }
@ -5464,11 +5487,11 @@ class HorizontalSlider : Slider {
thumb.tabStop = false; thumb.tabStop = false;
thumb.thumbWidth = 16; thumb.thumbWidth = scaleWithDpi(16);
thumb.thumbHeight = height; thumb.thumbHeight = height;
thumb.addEventListener(EventType.change, () { thumb.addEventListener(EventType.change, () {
auto sx = thumb.positionX * max() / (thumb.width - 16); auto sx = thumb.positionX * max() / (thumb.width - scaleWithDpi(16));
//informProgramThatUserChangedPosition(sx); //informProgramThatUserChangedPosition(sx);
position_ = sx; position_ = sx;
@ -5487,7 +5510,7 @@ class HorizontalSlider : Slider {
version(custom_widgets) version(custom_widgets)
protected override void setPositionCustom(int a) { protected override void setPositionCustom(int a) {
if(max()) if(max())
thumb.positionX = a * (thumb.width - 16) / max(); thumb.positionX = a * (thumb.width - scaleWithDpi(16)) / max();
redraw(); redraw();
} }
} }
@ -5499,11 +5522,12 @@ abstract class ScrollbarBase : Widget {
this(Widget parent) { this(Widget parent) {
super(parent); super(parent);
tabStop = false; tabStop = false;
step_ = scaleWithDpi(16);
} }
private int viewableArea_; private int viewableArea_;
private int max_; private int max_;
private int step_ = 16; private int step_;// = 16;
private int position_; private int position_;
/// ///
@ -5837,7 +5861,7 @@ class HorizontalScrollbar : ScrollbarBase {
}); });
thumb.thumbWidth = this.minWidth; thumb.thumbWidth = this.minWidth;
thumb.thumbHeight = 16; thumb.thumbHeight = scaleWithDpi(16);
thumb.addEventListener(EventType.change, () { thumb.addEventListener(EventType.change, () {
auto sx = thumb.positionX * max() / thumb.width; auto sx = thumb.positionX * max() / thumb.width;
@ -5849,9 +5873,9 @@ class HorizontalScrollbar : ScrollbarBase {
} }
} }
override int minHeight() { return 16; } override int minHeight() { return scaleWithDpi(16); }
override int maxHeight() { return 16; } override int maxHeight() { return scaleWithDpi(16); }
override int minWidth() { return 48; } override int minWidth() { return scaleWithDpi(48); }
} }
class ScrollToPositionEvent : Event { class ScrollToPositionEvent : Event {
@ -5953,7 +5977,7 @@ class VerticalScrollbar : ScrollbarBase {
}); });
thumb.thumbWidth = this.minWidth; thumb.thumbWidth = this.minWidth;
thumb.thumbHeight = 16; thumb.thumbHeight = scaleWithDpi(16);
thumb.addEventListener(EventType.change, () { thumb.addEventListener(EventType.change, () {
auto sy = thumb.positionY * max() / thumb.height; auto sy = thumb.positionY * max() / thumb.height;
@ -5970,9 +5994,9 @@ class VerticalScrollbar : ScrollbarBase {
} }
} }
override int minWidth() { return 16; } override int minWidth() { return scaleWithDpi(16); }
override int maxWidth() { return 16; } override int maxWidth() { return scaleWithDpi(16); }
override int minHeight() { return 48; } override int minHeight() { return scaleWithDpi(48); }
} }
@ -6380,7 +6404,7 @@ class TabMessageWidget : Widget {
draw3dFrame(posX, 0, tabWidth, tabBarHeight, painter, isCurrent ? FrameStyle.risen : FrameStyle.sunk, isCurrent ? cs.windowBackgroundColor : darken(cs.windowBackgroundColor, 0.1)); draw3dFrame(posX, 0, tabWidth, tabBarHeight, painter, isCurrent ? FrameStyle.risen : FrameStyle.sunk, isCurrent ? cs.windowBackgroundColor : darken(cs.windowBackgroundColor, 0.1));
painter.outlineColor = cs.foregroundColor; painter.outlineColor = cs.foregroundColor;
painter.drawText(Point(posX + 4, 2), title); painter.drawText(Point(posX + 4, 2), title, Point(posX + tabWidth, tabBarHeight - 2), TextAlignment.VerticalCenter);
if(isCurrent) { if(isCurrent) {
painter.outlineColor = cs.windowBackgroundColor; painter.outlineColor = cs.windowBackgroundColor;
@ -7127,16 +7151,16 @@ class ScrollMessageWidget : Widget {
registerMovement(); registerMovement();
hsb.height = 16; // FIXME? are tese 16s sane? hsb.height = scaleWithDpi(16); // FIXME? are tese 16s sane?
hsb.x = 0; hsb.x = 0;
hsb.y = this.height - hsb.height; hsb.y = this.height - hsb.height;
hsb.width = this.width - 16; hsb.width = this.width - scaleWithDpi(16);
hsb.recomputeChildLayout(); hsb.recomputeChildLayout();
vsb.width = 16; // FIXME? vsb.width = scaleWithDpi(16); // FIXME?
vsb.x = this.width - vsb.width; vsb.x = this.width - vsb.width;
vsb.y = 0; vsb.y = 0;
vsb.height = this.height - 16; vsb.height = this.height - scaleWithDpi(16);
vsb.recomputeChildLayout(); vsb.recomputeChildLayout();
if(this.header is null) { if(this.header is null) {
@ -7149,13 +7173,13 @@ class ScrollMessageWidget : Widget {
header.x = 0; header.x = 0;
header.y = 0; header.y = 0;
header.width = this.width - vsb.width; header.width = this.width - vsb.width;
header.height = 16; // size of the button header.height = scaleWithDpi(16); // size of the button
header.recomputeChildLayout(); header.recomputeChildLayout();
container.x = 0; container.x = 0;
container.y = 16; container.y = scaleWithDpi(16);
container.width = this.width - vsb.width; container.width = this.width - vsb.width;
container.height = this.height - hsb.height - 16; container.height = this.height - hsb.height - scaleWithDpi(16);
container.recomputeChildLayout(); container.recomputeChildLayout();
} }
} }
@ -7476,6 +7500,10 @@ class Window : Widget {
win.onDpiChanged = { win.onDpiChanged = {
this.queueRecomputeChildLayout(); this.queueRecomputeChildLayout();
auto event = new DpiChangedEvent(this);
event.sendDirectly();
privateDpiChanged();
}; };
win.setEventHandlers( win.setEventHandlers(
@ -7872,6 +7900,18 @@ class Window : Widget {
mixin Emits!ClosedEvent; mixin Emits!ClosedEvent;
} }
/++
History:
Added January 12, 2022
+/
class DpiChangedEvent : Event {
enum EventString = "dpichanged";
this(Widget target) {
super(EventString, target);
}
}
debug private class DevToolWindow : Window { debug private class DevToolWindow : Window {
Window p; Window p;
@ -7999,7 +8039,7 @@ class TableView : Widget {
} else version(custom_widgets) { } else version(custom_widgets) {
auto smw = new ScrollMessageWidget(this); auto smw = new ScrollMessageWidget(this);
smw.addDefaultKeyboardListeners(); smw.addDefaultKeyboardListeners();
smw.addDefaultWheelListeners(1, 16); smw.addDefaultWheelListeners(1, scaleWithDpi(16));
tvwi = new TableViewWidgetInner(this, smw); tvwi = new TableViewWidgetInner(this, smw);
} }
} }
@ -8520,7 +8560,7 @@ private class TableViewWidgetInner : Widget {
private int columnsWidth; private int columnsWidth;
int lh = 16; // FIXME lineHeight private int lh() { return scaleWithDpi(16); } // FIXME lineHeight
override void registerMovement() { override void registerMovement() {
super.registerMovement(); super.registerMovement();
@ -8643,7 +8683,7 @@ private class TableViewWidgetInner : Widget {
child.x = pos; child.x = pos;
child.y = 0; child.y = 0;
child.width = tvw.tvw.columns[idx].calculatedWidth; child.width = tvw.tvw.columns[idx].calculatedWidth;
child.height = 16;// this.height; child.height = scaleWithDpi(16);// this.height;
pos += child.width; pos += child.width;
child.recomputeChildLayout(); child.recomputeChildLayout();
@ -8658,7 +8698,7 @@ private class TableViewWidgetInner : Widget {
remainder.width = this.width - pos;// + 4; remainder.width = this.width - pos;// + 4;
else else
remainder.width = 0; remainder.width = 0;
remainder.height = 16; remainder.height = scaleWithDpi(16);
remainder.recomputeChildLayout(); remainder.recomputeChildLayout();
} }
@ -9534,6 +9574,14 @@ class StatusBar : Widget {
} else static assert(false); } else static assert(false);
} }
version(win32_widgets)
override protected void dpiChanged() {
RECT rect;
GetWindowRect(hwnd, &rect);
idealHeight = rect.bottom - rect.top;
assert(idealHeight);
}
version(custom_widgets) version(custom_widgets)
override void paint(WidgetPainter painter) { override void paint(WidgetPainter painter) {
auto cs = getComputedStyle(); auto cs = getComputedStyle();
@ -9557,7 +9605,7 @@ class StatusBar : Widget {
version(win32_widgets) { version(win32_widgets) {
private const int idealHeight; private int idealHeight;
override int maxHeight() { return idealHeight; } override int maxHeight() { return idealHeight; }
override int minHeight() { return idealHeight; } override int minHeight() { return idealHeight; }
} else version(custom_widgets) { } else version(custom_widgets) {
@ -10045,9 +10093,9 @@ class MenuItem : MouseActivatedWidget {
else else
painter.outlineColor = cs.foregroundColor; painter.outlineColor = cs.foregroundColor;
painter.fillColor = Color.transparent; painter.fillColor = Color.transparent;
painter.drawText(Point(cast(MenuBar) this.parent ? 4 : 20, 2), label, Point(width, height), TextAlignment.Left); painter.drawText(scaleWithDpi(Point(cast(MenuBar) this.parent ? 4 : 20, 0)), label, Point(width, height), TextAlignment.Left | TextAlignment.VerticalCenter);
if(action && action.accelerator !is KeyEvent.init) { if(action && action.accelerator !is KeyEvent.init) {
painter.drawText(Point(cast(MenuBar) this.parent ? 4 : 20, 2), action.accelerator.toStr(), Point(width - 4, height), TextAlignment.Right); painter.drawText(scaleWithDpi(Point(cast(MenuBar) this.parent ? 4 : 20, 0)), action.accelerator.toStr(), Point(width - 4, height), TextAlignment.Right | TextAlignment.VerticalCenter);
} }
} }
@ -10330,14 +10378,14 @@ class Checkbox : MouseActivatedWidget {
painter.outlineColor = Color.black; painter.outlineColor = Color.black;
painter.fillColor = Color.white; painter.fillColor = Color.white;
painter.drawRectangle(Point(2, 2), buttonSize - 2, buttonSize - 2); painter.drawRectangle(scaleWithDpi(Point(2, 2)), scaleWithDpi(buttonSize - 2), scaleWithDpi(buttonSize - 2));
if(isChecked) { if(isChecked) {
painter.pen = Pen(Color.black, 2); painter.pen = Pen(Color.black, 2);
// I'm using height so the checkbox is square // I'm using height so the checkbox is square
enum padding = 5; enum padding = 5;
painter.drawLine(Point(padding, padding), Point(buttonSize - (padding-2), buttonSize - (padding-2))); painter.drawLine(scaleWithDpi(Point(padding, padding)), scaleWithDpi(Point(buttonSize - (padding-2), buttonSize - (padding-2))));
painter.drawLine(Point(buttonSize-(padding-2), padding), Point(padding, buttonSize - (padding-2))); painter.drawLine(scaleWithDpi(Point(buttonSize-(padding-2), padding)), scaleWithDpi(Point(padding, buttonSize - (padding-2))));
painter.pen = Pen(Color.black, 1); painter.pen = Pen(Color.black, 1);
} }
@ -10347,7 +10395,7 @@ class Checkbox : MouseActivatedWidget {
painter.fillColor = cs.foregroundColor(); painter.fillColor = cs.foregroundColor();
// FIXME: should prolly just align the baseline or something // FIXME: should prolly just align the baseline or something
painter.drawText(Point(buttonSize + 4, 2), label, Point(width, height), TextAlignment.Left | TextAlignment.VerticalCenter); painter.drawText(scaleWithDpi(Point(buttonSize + 4, 2)), label, Point(width, height), TextAlignment.Left | TextAlignment.VerticalCenter);
} }
} }
@ -10440,18 +10488,18 @@ class Radiobox : MouseActivatedWidget {
painter.outlineColor = Color.black; painter.outlineColor = Color.black;
painter.fillColor = Color.white; painter.fillColor = Color.white;
painter.drawEllipse(Point(2, 2), Point(buttonSize - 2, buttonSize - 2)); painter.drawEllipse(scaleWithDpi(Point(2, 2)), scaleWithDpi(Point(buttonSize - 2, buttonSize - 2)));
if(isChecked) { if(isChecked) {
painter.outlineColor = Color.black; painter.outlineColor = Color.black;
painter.fillColor = Color.black; painter.fillColor = Color.black;
// I'm using height so the checkbox is square // I'm using height so the checkbox is square
painter.drawEllipse(Point(5, 5), Point(buttonSize - 5, buttonSize - 5)); painter.drawEllipse(scaleWithDpi(Point(5, 5)), scaleWithDpi(Point(buttonSize - 5, buttonSize - 5)));
} }
painter.outlineColor = cs.foregroundColor(); painter.outlineColor = cs.foregroundColor();
painter.fillColor = cs.foregroundColor(); painter.fillColor = cs.foregroundColor();
painter.drawText(Point(buttonSize + 4, 0), label, Point(width, height), TextAlignment.Left | TextAlignment.VerticalCenter); painter.drawText(scaleWithDpi(Point(buttonSize + 4, 0)), label, Point(width, height), TextAlignment.Left | TextAlignment.VerticalCenter);
} }
@ -10700,10 +10748,10 @@ class ArrowButton : Button {
private ArrowDirection direction; private ArrowDirection direction;
override int minHeight() { return 16; } override int minHeight() { return scaleWithDpi(16); }
override int maxHeight() { return 16; } override int maxHeight() { return scaleWithDpi(16); }
override int minWidth() { return 16; } override int minWidth() { return scaleWithDpi(16); }
override int maxWidth() { return 16; } override int maxWidth() { return scaleWithDpi(16); }
override void paint(WidgetPainter painter) { override void paint(WidgetPainter painter) {
super.paint(painter); super.paint(painter);
@ -10713,39 +10761,39 @@ class ArrowButton : Button {
painter.outlineColor = cs.foregroundColor; painter.outlineColor = cs.foregroundColor;
painter.fillColor = cs.foregroundColor; painter.fillColor = cs.foregroundColor;
auto offset = Point((this.width - 16) / 2, (this.height - 16) / 2); auto offset = Point((this.width - scaleWithDpi(16)) / 2, (this.height - scaleWithDpi(16)) / 2);
final switch(direction) { final switch(direction) {
case ArrowDirection.up: case ArrowDirection.up:
painter.drawPolygon( painter.drawPolygon(
Point(2, 10) + offset, scaleWithDpi(Point(2, 10) + offset),
Point(7, 5) + offset, scaleWithDpi(Point(7, 5) + offset),
Point(12, 10) + offset, scaleWithDpi(Point(12, 10) + offset),
Point(2, 10) + offset scaleWithDpi(Point(2, 10) + offset)
); );
break; break;
case ArrowDirection.down: case ArrowDirection.down:
painter.drawPolygon( painter.drawPolygon(
Point(2, 6) + offset, scaleWithDpi(Point(2, 6) + offset),
Point(7, 11) + offset, scaleWithDpi(Point(7, 11) + offset),
Point(12, 6) + offset, scaleWithDpi(Point(12, 6) + offset),
Point(2, 6) + offset scaleWithDpi(Point(2, 6) + offset)
); );
break; break;
case ArrowDirection.left: case ArrowDirection.left:
painter.drawPolygon( painter.drawPolygon(
Point(10, 2) + offset, scaleWithDpi(Point(10, 2) + offset),
Point(5, 7) + offset, scaleWithDpi(Point(5, 7) + offset),
Point(10, 12) + offset, scaleWithDpi(Point(10, 12) + offset),
Point(10, 2) + offset scaleWithDpi(Point(10, 2) + offset)
); );
break; break;
case ArrowDirection.right: case ArrowDirection.right:
painter.drawPolygon( painter.drawPolygon(
Point(6, 2) + offset, scaleWithDpi(Point(6, 2) + offset),
Point(11, 7) + offset, scaleWithDpi(Point(11, 7) + offset),
Point(6, 12) + offset, scaleWithDpi(Point(6, 12) + offset),
Point(6, 2) + offset scaleWithDpi(Point(6, 2) + offset)
); );
break; break;
} }
@ -10950,7 +10998,7 @@ abstract class EditableTextWidget : EditableTextWidgetParent {
} else static assert(false); } else static assert(false);
} }
override int minWidth() { return 16; } override int minWidth() { return scaleWithDpi(16); }
override int minHeight() { return defaultLineHeight + 0; } // the +0 is to leave room for the padding override int minHeight() { return defaultLineHeight + 0; } // the +0 is to leave room for the padding
override int widthStretchiness() { return 7; } override int widthStretchiness() { return 7; }
@ -11359,6 +11407,7 @@ class MessageBox : Window {
this.message = message; this.message = message;
int buttonsWidth = cast(int) buttons.length * 50 + (cast(int) buttons.length - 1) * 16; int buttonsWidth = cast(int) buttons.length * 50 + (cast(int) buttons.length - 1) * 16;
buttonsWidth = scaleWithDpi(buttonsWidth);
int x = this.width / 2 - buttonsWidth / 2; int x = this.width / 2 - buttonsWidth / 2;
@ -11373,7 +11422,7 @@ class MessageBox : Window {
button.registerMovement(); button.registerMovement();
x += button.width; x += button.width;
x += 16; x += scaleWithDpi(16);
if(idx == 0) if(idx == 0)
button.focus(); button.focus();
} }

46
terminal.d
View File

@ -8197,10 +8197,16 @@ version(TerminalDirectToEmulator) {
If you want specific values for these things, you should set If you want specific values for these things, you should set
them in your own application. them in your own application.
On January 12, 2022, I changed the font size to be auto-scaled
with detected dpi by default. You can undo this by setting
`scaleFontSizeWithDpi` to false.
+/ +/
string fontName = defaultFont; string fontName = defaultFont;
/// ditto /// ditto
int fontSize = defaultSize; int fontSize = defaultSize;
/// ditto
bool scaleFontSizeWithDpi = true;
/++ /++
Requested initial terminal size in character cells. You may not actually get exactly this. Requested initial terminal size in character cells. You may not actually get exactly this.
@ -8619,8 +8625,8 @@ version(TerminalDirectToEmulator) {
this(Terminal* term, ScrollMessageWidget parent) { this(Terminal* term, ScrollMessageWidget parent) {
this.smw = parent; this.smw = parent;
this.term = term; this.term = term;
terminalEmulator = new TerminalEmulatorInsideWidget(this);
super(parent); super(parent);
terminalEmulator = new TerminalEmulatorInsideWidget(this);
this.parentWindow.addEventListener("closed", { this.parentWindow.addEventListener("closed", {
if(term) { if(term) {
term.hangedUp = true; term.hangedUp = true;
@ -8684,6 +8690,13 @@ version(TerminalDirectToEmulator) {
} }
} }
override void dpiChanged() {
if(terminalEmulator) {
terminalEmulator.loadFont();
terminalEmulator.resized(width, height);
}
}
TerminalEmulatorInsideWidget terminalEmulator; TerminalEmulatorInsideWidget terminalEmulator;
override void registerMovement() { override void registerMovement() {
@ -8889,16 +8902,18 @@ version(TerminalDirectToEmulator) {
@property bool invalidateAll() { return super.invalidateAll; } @property bool invalidateAll() { return super.invalidateAll; }
private this(TerminalEmulatorWidget widget) { void loadFont() {
if(this.font) {
this.syncSignal = new Semaphore(); this.font.unload();
this.outgoingSignal = new Semaphore(); this.font = null;
this.incomingSignal = new Semaphore(); }
auto fontSize = integratedTerminalEmulatorConfiguration.fontSize;
this.widget = widget; if(integratedTerminalEmulatorConfiguration.scaleFontSizeWithDpi) {
fontSize = widget.scaleWithDpi(fontSize);
}
if(integratedTerminalEmulatorConfiguration.fontName.length) { if(integratedTerminalEmulatorConfiguration.fontName.length) {
this.font = new OperatingSystemFont(integratedTerminalEmulatorConfiguration.fontName, integratedTerminalEmulatorConfiguration.fontSize, FontWeight.medium); this.font = new OperatingSystemFont(integratedTerminalEmulatorConfiguration.fontName, fontSize, FontWeight.medium);
if(this.font.isNull) { if(this.font.isNull) {
// carry on, it will try a default later // carry on, it will try a default later
} else if(this.font.isMonospace) { } else if(this.font.isMonospace) {
@ -8910,7 +8925,18 @@ version(TerminalDirectToEmulator) {
} }
if(this.font is null || this.font.isNull) if(this.font is null || this.font.isNull)
loadDefaultFont(integratedTerminalEmulatorConfiguration.fontSize); loadDefaultFont(fontSize);
}
private this(TerminalEmulatorWidget widget) {
this.syncSignal = new Semaphore();
this.outgoingSignal = new Semaphore();
this.incomingSignal = new Semaphore();
this.widget = widget;
loadFont();
super(integratedTerminalEmulatorConfiguration.initialWidth ? integratedTerminalEmulatorConfiguration.initialWidth : 80, super(integratedTerminalEmulatorConfiguration.initialWidth ? integratedTerminalEmulatorConfiguration.initialWidth : 80,
integratedTerminalEmulatorConfiguration.initialHeight ? integratedTerminalEmulatorConfiguration.initialHeight : 30); integratedTerminalEmulatorConfiguration.initialHeight ? integratedTerminalEmulatorConfiguration.initialHeight : 30);