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

osx stuff

This commit is contained in:
Adam D. Ruppe 2020-01-31 18:30:57 -05:00
parent ca8aa18fd2
commit 96990d94ff
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -36,6 +36,8 @@
"targetType": "library", "targetType": "library",
"importPaths": ["."], "importPaths": ["."],
"dflags": ["-mv=arsd.simpledisplay=simpledisplay.d"], "dflags": ["-mv=arsd.simpledisplay=simpledisplay.d"],
"versions-osx": [ "OSXCocoa", "allow_unimplemented_features", "without_opengl" ],
"lflags-osx": ["-framework", "Cocoa"],
"dependencies": {"arsd-official:color_base":"*"}, "dependencies": {"arsd-official:color_base":"*"},
"configurations": [ "configurations": [
{ {

6
minigui.d
View File

@ -5721,7 +5721,8 @@ abstract class EditableTextWidget : EditableTextWidgetParent {
else version(custom_widgets) { else version(custom_widgets) {
// FIXME // FIXME
Timer caretTimer; static if(SimpledisplayTimerAvailable)
Timer caretTimer;
TextLayout textLayout; TextLayout textLayout;
void setupCustomTextEditing() { void setupCustomTextEditing() {
@ -5801,6 +5802,7 @@ abstract class EditableTextWidget : EditableTextWidgetParent {
auto painter = this.draw(); auto painter = this.draw();
textLayout.drawCaret(painter); textLayout.drawCaret(painter);
static if(SimpledisplayTimerAvailable)
if(caretTimer) { if(caretTimer) {
caretTimer.destroy(); caretTimer.destroy();
caretTimer = null; caretTimer = null;
@ -5812,6 +5814,7 @@ abstract class EditableTextWidget : EditableTextWidgetParent {
blinkingCaret = false; // if on a remote connection, don't waste bandwidth on an expendable blink blinkingCaret = false; // if on a remote connection, don't waste bandwidth on an expendable blink
if(blinkingCaret) if(blinkingCaret)
static if(SimpledisplayTimerAvailable)
caretTimer = new Timer(500, { caretTimer = new Timer(500, {
if(parentWindow.win.closed) { if(parentWindow.win.closed) {
caretTimer.destroy(); caretTimer.destroy();
@ -5833,6 +5836,7 @@ abstract class EditableTextWidget : EditableTextWidgetParent {
version(custom_widgets) { version(custom_widgets) {
auto painter = this.draw(); auto painter = this.draw();
textLayout.eraseCaret(painter); textLayout.eraseCaret(painter);
static if(SimpledisplayTimerAvailable)
if(caretTimer) { if(caretTimer) {
caretTimer.destroy(); caretTimer.destroy();
caretTimer = null; caretTimer = null;

14
simpledisplay.d
View File

@ -809,6 +809,15 @@ unittest {
} }
} }
/*
version(OSX) {
version=without_opengl;
version=allow_unimplemented_features;
version=OSXCocoa;
pragma(linkerDirective, "-framework Cocoa");
}
*/
version(without_opengl) { version(without_opengl) {
enum SdpyIsUsingIVGLBinds = false; enum SdpyIsUsingIVGLBinds = false;
} else /*version(Posix)*/ { } else /*version(Posix)*/ {
@ -992,6 +1001,11 @@ version(Windows)
version(linux) version(linux)
version = with_timer; version = with_timer;
version(with_timer)
enum bool SimpledisplayTimerAvailable = true;
else
enum bool SimpledisplayTimerAvailable = false;
/// If you have to get down and dirty with implementation details, this helps figure out if Windows is available you can `static if(UsingSimpledisplayWindows) ...` more reliably than `version()` because `version` is module-local. /// If you have to get down and dirty with implementation details, this helps figure out if Windows is available you can `static if(UsingSimpledisplayWindows) ...` more reliably than `version()` because `version` is module-local.
version(Windows) version(Windows)
enum bool UsingSimpledisplayWindows = true; enum bool UsingSimpledisplayWindows = true;