Projector Screen Margins

Quelea/languages/gb.lang

@@ -716,4 +716,8 @@ filefilters.description.sunday.plus=Sunday plus songs
 song.list=Song list
 password.empty.label=Empty password found
 password.empty.message=The server password cannot be empty. The default password "quelea" will be used unless you enter something in the password box.
+projector.margin.top=Margin Top
+projector.margin.right=Margin Right
+projector.margin.bottom=Margin Bottom
+projector.margin.left=Margin Left
 slide.transition.label=Use fade transition between slides

Quelea/src/main/java/org/quelea/services/utils/PercentMargins.java

@@ -0,0 +1,77 @@
+/*
+ * This file is part of Quelea, free projection software for churches.
+ *
+ * Copyright (C) 2012 Michael Berry
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.quelea.services.utils;
+
+import javafx.geometry.BoundingBox;
+import javafx.geometry.Bounds;
+
+/**
+ * Percentage-based (0-1) margins to be applied to a display
+ * <p/>
+ * @author Dallon Feldner
+ */
+public class PercentMargins {
+
+    private double top;
+    private double right;
+    private double bottom;
+    private double left;
+
+    public PercentMargins(double top, double right, double bottom, double left) {
+        this.top = top;
+        this.right = right;
+        this.bottom = bottom;
+        this.left = left;
+    }
+
+    @Override
+    public String toString() {
+        return top + "," + right + "," + bottom + "," + left;
+    }
+
+    public double getTop() {
+        return top;
+    }
+
+    public double getRight() {
+        return right;
+    }
+
+    public double getBottom() {
+        return bottom;
+    }
+
+    public double getLeft() {
+        return left;
+    }
+
+    public Bounds applyMargins(Bounds coords) {
+        double leftMargin = left * coords.getWidth();
+        double topMargin = top * coords.getHeight();
+
+        return new BoundingBox(
+                coords.getMinX() + leftMargin,
+                coords.getMinY() + topMargin,
+                coords.getWidth() - leftMargin - right* coords.getWidth(),
+                coords.getHeight() - topMargin - bottom* coords.getHeight()
+        );
+    }
+
+}
+

Quelea/src/main/java/org/quelea/services/utils/QueleaProperties.java

@@ -26,6 +26,7 @@
 import java.util.Properties;
 import java.util.logging.Level;
 
+import com.sun.istack.NotNull;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
 import javafx.scene.paint.Color;
@@ -1124,6 +1125,10 @@ public Bounds getProjectorCoords() {
                 Integer.parseInt(prop[3]));
     }
 
+    public Bounds getProjectorCoordsWithMargins() {
+        return applyProjectorMargin(getProjectorCoords());
+    }
+
     /**
      * Set the custom projector co-ordinates.
      * <p>
@@ -2274,6 +2279,57 @@ public double getLyricHeightBounds() {
         return Double.parseDouble(getProperty(lyricHeightBoundKey, "0.9"));
     }
 
+    public PercentMargins getProjectorMargin() {
+        String[] parts = getProperty(projectorMarginKey, "0,0,0,0").split(",");
+        if (parts.length == 4) {
+            return new PercentMargins(
+                    Double.parseDouble(parts[0]),
+                    Double.parseDouble(parts[1]),
+                    Double.parseDouble(parts[2]),
+                    Double.parseDouble(parts[3])
+            );
+        } else {
+            return new PercentMargins(0,0,0,0);
+        }
+    }
+
+    public void setProjectorMargin(@NotNull PercentMargins margins) {
+        setProperty(projectorMarginKey, margins.toString());
+    }
+
+    public void setProjectorMarginTop(double value) {
+        PercentMargins prop = getProjectorMargin();
+        PercentMargins newProp = new PercentMargins(value, prop.getRight(), prop.getBottom(), prop.getLeft());
+        setProjectorMargin(newProp);
+    }
+
+    public void setProjectorMarginRight(double value) {
+        PercentMargins prop = getProjectorMargin();
+        PercentMargins newProp = new PercentMargins(prop.getTop(), value, prop.getBottom(), prop.getLeft());
+        setProjectorMargin(newProp);
+    }
+
+    public void setProjectorMarginBottom(double value) {
+        PercentMargins prop = getProjectorMargin();
+        PercentMargins newProp = new PercentMargins(prop.getTop(), prop.getRight(), value, prop.getLeft());
+        setProjectorMargin(newProp);
+    }
+
+    public void setProjectorMarginLeft(double value) {
+        PercentMargins prop = getProjectorMargin();
+        PercentMargins newProp = new PercentMargins(prop.getTop(), prop.getRight(), prop.getBottom(), value);
+        setProjectorMargin(newProp);
+    }
+
+    public boolean hasProjectorMargin() {
+        PercentMargins margins = getProjectorMargin();
+        return margins.getTop() > 0 || margins.getLeft() > 0 || margins.getBottom() > 0 || margins.getRight() > 0;
+    }
+
+    public Bounds applyProjectorMargin(Bounds coords) {
+        return getProjectorMargin().applyMargins(coords);
+    }
+
     public boolean getDefaultSongDBUpdate() {
         return Boolean.parseBoolean(getProperty(defaultSongDbUpdateKey, "true"));
     }

Quelea/src/main/java/org/quelea/services/utils/QueleaPropertyKeys.java

@@ -126,6 +126,11 @@ public class QueleaPropertyKeys {
     public static final String stageWCoordKey = "stage.width.coord";
     public static final String stageHCoordKey = "stage.height.coord";
     public static final String darkThemeKey = "use.dark.theme";
+    public static final String projectorMarginKey = "projector.margin";
+    public static final String projectorMarginTopKey = "projector.margin.top";
+    public static final String projectorMarginRightKey = "projector.margin.right";
+    public static final String projectorMarginBottomKey = "projector.margin.bottom";
+    public static final String projectorMarginLeftKey = "projector.margin.left";
     public static final String useSlideTransitionKey = "use.fade";
     public static final String slideTransitionInDurationKey = "slide.transition.duration.in";
     public static final String slideTransitionOutDurationKey = "slide.transition.duration.out";

Quelea/src/main/java/org/quelea/windows/main/Main.java

@@ -184,19 +184,31 @@ public void run() {
                     if (lyricsHidden) {
                         LOGGER.log(Level.INFO, "Hiding projector display on monitor 0 (base 0!)");
                         Platform.runLater(() -> {
-                            fullScreenWindow = new DisplayStage(Utils.getBoundsFromRect2D(monitors.get(0).getVisualBounds()), false);
+                            fullScreenWindow = new DisplayStage(
+                                    QueleaProperties.get().applyProjectorMargin(
+                                        Utils.getBoundsFromRect2D(monitors.get(0).getVisualBounds())
+                                    ),
+                                    false
+                            );
                             fullScreenWindow.hide();
                         });
                     } else if (QueleaProperties.get().isProjectorModeCoords()) {
-                        LOGGER.log(Level.INFO, "Starting projector display: ", QueleaProperties.get().getProjectorCoords());
+                        LOGGER.log(Level.INFO, "Starting projector display: ", QueleaProperties.get().getProjectorCoordsWithMargins());
                         Platform.runLater(() -> {
-                            fullScreenWindow = new DisplayStage(QueleaProperties.get().getProjectorCoords(), false);
+                            fullScreenWindow = new DisplayStage(QueleaProperties.get().getProjectorCoordsWithMargins(), false);
                         });
                     } else {
                         LOGGER.log(Level.INFO, "Starting projector display on monitor {0} (base 0!)", projectorScreen);
                         Platform.runLater(() -> {
-                            fullScreenWindow = new DisplayStage(Utils.getBoundsFromRect2D(monitors.get(projectorScreen).getBounds()), false);
-                            fullScreenWindow.setFullScreenAlwaysOnTop(true);
+                            fullScreenWindow = new DisplayStage(
+                                    QueleaProperties.get().applyProjectorMargin(
+                                            Utils.getBoundsFromRect2D(monitors.get(projectorScreen).getBounds())
+                                    ),
+                                    false
+                            );
+                            if (!QueleaProperties.get().hasProjectorMargin()) {
+                                fullScreenWindow.setFullScreenAlwaysOnTop(true);
+                            }
                         });
                     }