Restored black bars and custom images instead of black bars, closes #1571

4 files changed, 28 insertions, 22 deletions

diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h
index 9c264ead49..9405f6e012 100644
--- a/servers/visual/rasterizer.h
+++ b/servers/visual/rasterizer.h
@@ -1014,6 +1014,8 @@ public:
 
 	virtual void reset_canvas() = 0;
 
+	virtual void draw_window_margins(int *p_margins, RID *p_margin_textures) = 0;
+
 	virtual ~RasterizerCanvas() {}
 };
 
diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp
index b5f98dd94c..cc4fe0809d 100644
--- a/servers/visual/visual_server_raster.cpp
+++ b/servers/visual/visual_server_raster.cpp
@@ -41,23 +41,29 @@
 
 int VisualServerRaster::changes = 0;
 
-/* CURSOR */
-void VisualServerRaster::cursor_set_rotation(float p_rotation, int p_cursor) {
-}
-void VisualServerRaster::cursor_set_texture(RID p_texture, const Point2 &p_center_offset, int p_cursor, const Rect2 &p_region) {
-}
-void VisualServerRaster::cursor_set_visible(bool p_visible, int p_cursor) {
-}
-void VisualServerRaster::cursor_set_pos(const Point2 &p_pos, int p_cursor) {
-}
-
 /* BLACK BARS */
 
 void VisualServerRaster::black_bars_set_margins(int p_left, int p_top, int p_right, int p_bottom) {
+
+	black_margin[MARGIN_LEFT] = p_left;
+	black_margin[MARGIN_TOP] = p_top;
+	black_margin[MARGIN_RIGHT] = p_right;
+	black_margin[MARGIN_BOTTOM] = p_bottom;
 }
+
 void VisualServerRaster::black_bars_set_images(RID p_left, RID p_top, RID p_right, RID p_bottom) {
+
+	black_image[MARGIN_LEFT] = p_left;
+	black_image[MARGIN_TOP] = p_top;
+	black_image[MARGIN_RIGHT] = p_right;
+	black_image[MARGIN_BOTTOM] = p_bottom;
 }
 
+void VisualServerRaster::_draw_margins() {
+
+	VSG::canvas_render->draw_window_margins(black_margin, black_image);
+};
+
 /* FREE */
 
 void VisualServerRaster::free(RID p_rid) {
@@ -121,6 +127,8 @@ void VisualServerRaster::draw() {
 
 		frame_drawn_callbacks.pop_front();
 	}
+
+	_draw_margins();
 }
 void VisualServerRaster::sync() {
 }
@@ -189,6 +197,9 @@ VisualServerRaster::VisualServerRaster() {
 	VSG::storage = VSG::rasterizer->get_storage();
 	VSG::canvas_render = VSG::rasterizer->get_canvas();
 	VSG::scene_render = VSG::rasterizer->get_scene();
+
+	for (int i = 0; i < 4; i++)
+		black_margin[i] = 0;
 }
 
 VisualServerRaster::~VisualServerRaster() {
diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h
index 56e4323f7c..596dd5c10e 100644
--- a/servers/visual/visual_server_raster.h
+++ b/servers/visual/visual_server_raster.h
@@ -61,6 +61,9 @@ class VisualServerRaster : public VisualServer {
 	bool draw_extra_frame;
 	RID test_cube;
 
+	int black_margin[4];
+	RID black_image[4];
+
 	struct FrameDrawnCallbacks {
 
 		ObjectID object;
@@ -584,6 +587,8 @@ class VisualServerRaster : public VisualServer {
 
 #endif
 
+	void _draw_margins();
+
 public:
 	_FORCE_INLINE_ static void redraw_request() { changes++; }
 
@@ -1110,12 +1115,6 @@ public:
 
 	BIND2(canvas_occluder_polygon_set_cull_mode, RID, CanvasOccluderPolygonCullMode)
 
-	/* CURSOR */
-	virtual void cursor_set_rotation(float p_rotation, int p_cursor = 0); // radians
-	virtual void cursor_set_texture(RID p_texture, const Point2 &p_center_offset = Point2(0, 0), int p_cursor = 0, const Rect2 &p_region = Rect2());
-	virtual void cursor_set_visible(bool p_visible, int p_cursor = 0);
-	virtual void cursor_set_pos(const Point2 &p_pos, int p_cursor = 0);
-
 	/* BLACK BARS */
 
 	virtual void black_bars_set_margins(int p_left, int p_top, int p_right, int p_bottom);
diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h
index 6c98082b98..20223f9651 100644
--- a/servers/visual/visual_server_wrap_mt.h
+++ b/servers/visual/visual_server_wrap_mt.h
@@ -538,12 +538,6 @@ public:
 
 	FUNC2(canvas_occluder_polygon_set_cull_mode, RID, CanvasOccluderPolygonCullMode)
 
-	/* CURSOR */
-	FUNC2(cursor_set_rotation, float, int) // radians
-	FUNC4(cursor_set_texture, RID, const Point2 &, int, const Rect2 &)
-	FUNC2(cursor_set_visible, bool, int)
-	FUNC2(cursor_set_pos, const Point2 &, int)
-
 	/* BLACK BARS */
 
 	FUNC4(black_bars_set_margins, int, int, int, int)