nonfunctional toolbox, more polish

LunaTheFoxgirl · LunaTheFoxgirl · commit 55e0583e011e · 2019-10-28T09:34:17.000+01:00
diff --git a/dub.sdl b/dub.sdl
@@ -4,10 +4,7 @@ authors "Cospec Games" "Luna Nielsen"
 copyright "Copyright © 2019, Cospec Games"
 license "BSD 2-clause"
 dependency "wsfmt" version="~master"
-dependency "bindbc-opengl" version="~>0.9.0"
 dependency "gtk-d" version="~>3.9.0"
 dependency "sdlang-d" version="~>0.10.5"
-dependency "gfm" version="~>8.0.1"
 dependency "d-dazzle" version="~>1.0.1"
 dependency "d-handy" version="~>0.0.11"
-dependency "imageformats" version="~>7.0.2"
diff --git a/source/wsedit/subsystem/scenerenderer.d b/source/wsedit/subsystem/scenerenderer.d
diff --git a/source/wsedit/widgets/headerbar.d b/source/wsedit/widgets/headerbar.d
@@ -174,7 +174,6 @@ public:
         // Set the systemwide window title
         appwin.setName(wname);
         appwin.setTitle(wname);
-        appwin.setWmclass(wname, "WSEdit");
 
         // Set the title label.
         titleLabel.setText(name.length == 0 ? "Wereshift Scene Editor" : name);
diff --git a/source/wsedit/widgets/package.d b/source/wsedit/widgets/package.d
@@ -11,7 +11,7 @@
 */
 module wsedit.widgets;
 public import wsedit.widgets.headerbar;
-public import wsedit.widgets.workspace;
 public import wsedit.widgets.pages;
 public import wsedit.widgets.pathbox;
-public import wsedit.widgets.veccombo;
+public import wsedit.widgets.veccombo;
+public import wsedit.widgets.toolbox;
diff --git a/source/wsedit/widgets/pages/package.d b/source/wsedit/widgets/pages/package.d
@@ -10,4 +10,5 @@
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 module wsedit.widgets.pages;
-public import wsedit.widgets.pages.newscene;
+public import wsedit.widgets.pages.newscene;
+public import wsedit.widgets.pages.workspace;
diff --git a/source/wsedit/widgets/pages/workspace.d b/source/wsedit/widgets/pages/workspace.d
@@ -9,22 +9,24 @@
 
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-module wsedit.widgets.workspace;
+module wsedit.widgets.pages.workspace;
 import gtk.DrawingArea;
+import gtk.Overlay;
+import gtk.Widget;
+import gtk.Revealer;
+import gtk.Box;
+import gdkpixbuf.Pixbuf;
 import gdk.Cairo;
+import gdk.DragContext;
+import gdk.Cursor;
 import cairo.Context;
 import cairo.ImageSurface;
 import cairo.RecordingSurface;
 import cairo.FontFace;
 import cairo.FontOption;
 import cairo.Pattern;
 import cairo.Matrix;
-import cairo.c.functions : cairo_matrix_init_identity;
-import gdkpixbuf.Pixbuf;
-import gtk.Widget;
-import gdk.DragContext;
-import gdk.Cursor;
-import core.memory : GC;
+import wsedit.widgets;
 import wsedit;
 
 // status text
@@ -36,9 +38,8 @@ private {
 /**
     The editor workspace
 */
-class Workspace : DrawingArea {
+class WorkspaceViewport : DrawingArea {
 private:
-
     double animOffset = 0.0;
 
     double mouseX;
@@ -273,24 +274,29 @@ public:
     */
     Camera2D camera;
 
-    /**
-        The tile that the mouse is hovering over
-    */
-    Selection selectedTile;
-
     this() {
         super(1, 1);
-        selectedTile = Selection(0, 0);
-
         wereshiftLogo = new Pixbuf("res/wereshift.png");
+
+        /* Update */
+        import gtk.Widget : Widget;
+        import gdk.FrameClock : FrameClock;
+        this.addTickCallback((Widget, FrameClock) {
+            queueDraw();
+            return true;
+        });
+
+        /* Draw */
         this.addOnDraw((Scoped!Context ctx, Widget _) {
             return onDraw(ctx);
         });
 
+        /* Size alloc */
         this.addOnSizeAllocate((Allocation alloc, Widget) {
             area = GdkRectangle(alloc.x, alloc.y, alloc.width, alloc.height);
         });
 
+        /* Mouse controls */
         this.addOnMotionNotify(&onMotion);
         this.addOnButtonPress((GdkEventButton* ev, Widget) {
             if (STATE.scene is null) return true;
@@ -349,12 +355,26 @@ public:
             queueDraw();
             return true;
         });
+    }
+}
 
-        import gtk.Widget : Widget;
-        import gdk.FrameClock : FrameClock;
-        this.addTickCallback((Widget, FrameClock) {
-            queueDraw();
-            return true;
-        });
+class Workspace : Box {
+public:
+    Overlay overlay;
+    WorkspaceViewport viewport;
+    Toolbox toolbox;
+
+    this() {
+        super(Orientation.HORIZONTAL, 0);
+        viewport = new WorkspaceViewport();
+        overlay = new Overlay();
+        toolbox = new Toolbox();
+        toolbox.setValign(Align.START);
+        toolbox.setHalign(Align.START);
+        overlay.add(viewport);
+        overlay.addOverlay(toolbox);
+
+        this.packStart(overlay, true, true, 0);
     }
+
 }
diff --git a/source/wsedit/widgets/sidebar.d b/source/wsedit/widgets/sidebar.d
@@ -0,0 +1,22 @@
+module wsedit.widgets.sidebar;
+import gtk.Box;
+import gtk.Widget;
+import gtk.ScrolledWindow;
+import gtk.Revealer;
+import dazzle.DockBin;
+
+class Sidebar : Revealer {
+public:
+
+    this() {
+    }
+
+    void open() {
+        this.setRevealChild(true);
+    }
+
+    void close() {
+        this.setRevealChild(false);
+    }
+
+}
diff --git a/source/wsedit/widgets/toolbox.d b/source/wsedit/widgets/toolbox.d
@@ -0,0 +1,111 @@
+module wsedit.widgets.toolbox;
+import gtk.ToggleButton;
+import gtk.Label;
+import gtk.Box;
+import gtk.Image;
+import gtk.Widget;
+import dazzle.EntryBox;
+import gtk.ButtonBox;
+
+class Toolbox : Box {
+private:
+    Label titleBox;
+
+    Box buttons;
+    ToggleButton[] tools;
+    ToggleButton activeTool;
+
+    ToggleButton selectToolButton;
+    ToggleButton tileToolButton;
+    ToggleButton objectToolButton;
+    ToggleButton parallaxRegionTool;
+    bool isUpdating;
+
+    bool toolHoverHandler(Widget widget) {
+        titleBox.setText(widget.getName());
+        return false;
+    }
+
+    bool toolLeaveHandler(Widget widget) {
+        titleBox.setText(activeTool.getName());
+        return false;
+    }
+
+    void activationHandler(ToggleButton button) {
+        if (!isUpdating) {
+            isUpdating = true;
+            activeTool = button;
+            
+            foreach(tool; tools) {
+                
+                // You can't disable tools altogether.
+                if (tool == button) {
+                    tool.setActive(true);
+                    continue;
+                }
+
+                tool.setActive(false);
+            }
+
+            isUpdating = false;
+        }
+    }
+    
+
+public:
+    this() {
+        super(Orientation.VERTICAL, 0);
+        this.setMarginTop(8);
+        this.setMarginLeft(8);
+
+        titleBox = new Label("");
+
+        buttons = new Box(Orientation.HORIZONTAL, 0);
+        buttons.getStyleContext().addClass("linked");
+
+        selectToolButton = new ToggleButton();
+        selectToolButton.setName("Select Tool");
+        selectToolButton.setImage(new Image("edit-select-all-symbolic", IconSize.MENU));
+        selectToolButton.addOnEnterNotify((GdkEventCrossing*, _) { return toolHoverHandler(selectToolButton); });
+        selectToolButton.addOnLeaveNotify((GdkEventCrossing*, _) { return toolLeaveHandler(selectToolButton); });
+        selectToolButton.addOnToggled(&activationHandler);
+        activeTool = selectToolButton;
+
+        tileToolButton = new ToggleButton();
+        tileToolButton.setName("Tile Tool");
+        tileToolButton.setImage(new Image("view-grid-symbolic", IconSize.MENU));
+        tileToolButton.addOnEnterNotify((GdkEventCrossing*, _) { return toolHoverHandler(tileToolButton); });
+        tileToolButton.addOnLeaveNotify((GdkEventCrossing*, _) { return toolLeaveHandler(tileToolButton); });
+        tileToolButton.addOnToggled(&activationHandler);
+
+        objectToolButton = new ToggleButton();
+        objectToolButton.setName("Actor Tool");
+        objectToolButton.setImage(new Image("insert-object-symbolic", IconSize.MENU));
+        objectToolButton.addOnEnterNotify((GdkEventCrossing*, _) { return toolHoverHandler(objectToolButton); });
+        objectToolButton.addOnLeaveNotify((GdkEventCrossing*, _) { return toolLeaveHandler(objectToolButton); });
+        objectToolButton.addOnToggled(&activationHandler);
+
+        parallaxRegionTool = new ToggleButton();
+        parallaxRegionTool.setName("Parallax Tool");
+        parallaxRegionTool.setImage(new Image("insert-image-symbolic", IconSize.MENU));
+        parallaxRegionTool.addOnEnterNotify((GdkEventCrossing*, _) { return toolHoverHandler(parallaxRegionTool); });
+        parallaxRegionTool.addOnLeaveNotify((GdkEventCrossing*, _) { return toolLeaveHandler(parallaxRegionTool); });
+        parallaxRegionTool.addOnToggled(&activationHandler);
+
+        tools = [selectToolButton, tileToolButton, objectToolButton, parallaxRegionTool];
+
+        buttons.packStart(selectToolButton, false, false, 0);
+        buttons.packStart(tileToolButton, false, false, 0);
+        buttons.packStart(objectToolButton, false, false, 0);
+        buttons.packStart(parallaxRegionTool, false, false, 0);
+        selectToolButton.setActive(true);
+
+
+        this.packStart(buttons, false, false, 0);
+        this.packEnd(titleBox, false, false, 0);
+
+        // Activate select tool by default
+        selectToolButton.setActive(true);
+        titleBox.setText(activeTool.getName());
+    }
+}
diff --git a/source/wsedit/widgets/veccombo.d b/source/wsedit/widgets/veccombo.d
@@ -121,7 +121,7 @@ public:
         x.addOnChanged((_) {
             if (lockedTogether && !isChanging) {
                 isChanging = true;
-                y.setText(x.getText);
+                y.setValue(x.getValue);
                 return;
             }
 
@@ -131,7 +131,7 @@ public:
         y.addOnChanged((_) {
             if (lockedTogether && !isChanging) {
                 isChanging = true;
-                x.setText(y.getText);
+                x.setValue(y.getValue);
                 return;
             }
 
diff --git a/source/wsedit/windows/appwin.d b/source/wsedit/windows/appwin.d
@@ -71,6 +71,7 @@ public:
         this.setTitlebar(header);
         this.add(stack);
         this.setIconFromFile("res/wereshift.png");
+        this.setWmclass("Wereshift Scene Editor", "WSEdit");
         this.setSizeRequest(800, 600);
         this.showAll();
     }

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public:`
`71`	`71`	`this.setTitlebar(header);`
`72`	`72`	`this.add(stack);`
`73`	`73`	`this.setIconFromFile("res/wereshift.png");`
	`74`	`+ this.setWmclass("Wereshift Scene Editor", "WSEdit");`
`74`	`75`	`this.setSizeRequest(800, 600);`
`75`	`76`	`this.showAll();`
`76`	`77`	`}`