catching up

dub.json

@@ -6,30 +6,6 @@
 	"description": "Subpackage collection for web, database, terminal ui, gui, scripting, and more with a commitment to long-term compatibility and stability. Use individual subpackages instead of the overall package to avoid bringing in things you don't need/want!",
 	"authors": ["Adam D. Ruppe"],
 	"license":"BSL-1.0",
-	"dependencies": {
-		":simpledisplay": "*",
-		":minigui": "*",
-		":nanovega": "*",
-		":email": "*",
-		":image_files": "*",
-		":png": "*",
-		":htmltotext": "*",
-		":dom": "*",
-		":characterencodings": "*",
-		":cgi": "*",
-		":mysql": "*",
-		":postgres": "*",
-		":sqlite": "*",
-		":mssql": "*",
-		":http": "*",
-		":jsvar": "*",
-		":script": "*",
-		":terminal": "*",
-		":ttf": "*",
-		":color_base": "*",
-		":svg":"*",
-		":database_base": "*"
-	},
 	"subPackages": [
 		{
 			"name": "simpledisplay",
@@ -42,17 +18,17 @@
 			"configurations": [
 				{
 					"name": "normal",
-					"libs-windows": ["gdi32"]
+					"libs-windows": ["gdi32", "ole32"]
 				},
 				{
 					"name": "without-opengl",
 					"versions": ["without_opengl"],
-					"libs-windows": ["gdi32"]
+					"libs-windows": ["gdi32", "ole32"]
 				},
 				{
 					"name": "cocoa",
 					"versions-osx": [ "OSXCocoa", "allow_unimplemented_features", "without_opengl" ],
-					"lflags-osx": ["-framework", "Cocoa"],
+					"lflags-osx": ["-framework", "Cocoa"]
 				}
 			],
 			"sourceFiles": ["simpledisplay.d"]
@@ -81,6 +57,18 @@
 			"libs-posix": ["freetype", "fontconfig"],
 			"sourceFiles": ["nanovega.d", "blendish.d"]
 		},
+		{
+			"name": "minigui-nanovega",
+			"description": "Nanovega widget add-on for minigui. New in v9.2.",
+			"targetType": "library",
+			"dflags": ["-mv=arsd.minigui_addons.nanovega=minigui_addons/nanovega.d"],
+			"dependencies": {
+				"arsd-official:minigui":"*",
+				"arsd-official:nanovega":"*"
+			},
+			"importPaths": ["."],
+			"sourceFiles": ["minigui_addons/nanovega.d"]
+		},
 		{
 			"name": "gamehelpers",
 			"description": "Assorted game-related structs and algorithms",

minigui.d

@@ -2154,6 +2154,10 @@ class OpenGlWidget : Widget {
 		win = new SimpleWindow(640, 480, null, OpenGlOptions.yes, Resizability.automaticallyScaleIfPossible, WindowTypes.nestedChild, WindowFlags.normal, pwin);
 		super(parent);
 
+		windowsetup(win);
+	}
+
+	protected void windowsetup(SimpleWindow w) {
 		/*
 		win.onFocusChange = (bool getting) {
 			if(getting)
@@ -2185,6 +2189,7 @@ class OpenGlWidget : Widget {
 				},
 			);
 		}
+
 	}
 
 	override void paint(WidgetPainter painter) {

minigui_addons/nanovega.d

@@ -0,0 +1,61 @@
+/++
+	An [arsd.minigui] widget that can embed [arsd.nanovega].
+
+	History:
+		Added February 7, 2020 (version 9.2)
++/
+module arsd.minigui_addons.nanovega;
+
+import arsd.minigui;
+/// Since the nvg context uses UFCS, you probably want this anyway.
+public import arsd.nanovega;
+
+static if(OpenGlEnabled)
+/++
+	The NanoVegaWidget has a class you can use with [arsd.nanovega].
+
+	History:
+		Included in initial release on February 7, 2020 (dub package version 9.2).
++/
+class NanoVegaWidget : OpenGlWidget {
+	NVGContext nvg;
+
+	this(Widget parent) {
+		super(parent);
+
+		win.onClosing = delegate() {
+			nvg.kill();
+		};
+
+		win.visibleForTheFirstTime = delegate() {
+			nvg = nvgCreateContext();
+			if(nvg is null) throw new Exception("cannot initialize NanoVega");
+		};
+
+		win.redrawOpenGlScene = delegate() {
+			if(redrawNVGScene is null)
+				return;
+			glViewport(0, 0, this.width, this.height);
+			if(clearOnEachFrame) {
+				glClearColor(0, 0, 0, 0);
+				glClear(glNVGClearFlags);
+			}
+
+			nvg.beginFrame(this.width, this.height);
+			scope(exit) nvg.endFrame();
+
+			redrawNVGScene(nvg);
+		};
+	}
+	/// Set this to draw your nanovega frame.
+	void delegate(NVGContext nvg) redrawNVGScene;
+
+	/// If true, it automatically clears the widget canvas between each redraw call.
+	bool clearOnEachFrame = true;
+}
+
+/// Nanovega requires at least OpenGL 3.0, so this sets that requirement. You can override it later still, of course.
+shared static this() {
+	setOpenGLContextVersion(3, 0);
+}
+

webview.d

@@ -6,6 +6,12 @@
 +/
 module arsd.webview;
 
+// Please note; the Microsoft terms and conditions say they may be able to collect
+// information about your users if you use this on Windows.
+// see: https://developer.microsoft.com/en-us/microsoft-edge/webview2/
+
+// https://go.microsoft.com/fwlink/p/?LinkId=2124703
+
 
 /* Original https://github.com/zserge/webview notice below:
  * MIT License