dotdevelop · MakiWolf · Dec 25, 2023 · Dec 25, 2023 · Dec 25, 2023 · Dec 25, 2023
diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/HelperMethods.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/HelperMethods.cs
@@ -1,5 +1,5 @@
 // HelperMethods.cs
-// 
+//
 // Cut & paste from PangoCairoHelper.
 //
 // Author:
@@ -40,21 +40,21 @@ static class HelperMethods
 	{
 		public static T Kill<T>(this T gc) where T : IDisposable
 		{
-			if (gc != null) 
+			if (gc != null)
 				gc.Dispose ();
 			return default(T);
 		}
-		
+
 		public static T Kill<T>(this T gc, Action<T> action) where T : IDisposable
 		{
 			if (gc != null) {
 				action (gc);
 				gc.Dispose ();
 			}
-			
+
 			return default(T);
 		}
-		
+
 		/*
 		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
 		static extern void pango_cairo_show_layout (IntPtr cr, IntPtr layout);
@@ -64,65 +64,61 @@ public static void ShowLayout (this Cairo.Context cr, Pango.Layout layout)
 			pango_cairo_show_layout (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
 		}
 */
-		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
-		static extern IntPtr pango_cairo_create_layout (IntPtr cr);
-
 		public static Pango.Layout CreateLayout (this Cairo.Context cr)
 		{
-			IntPtr raw_ret = pango_cairo_create_layout (cr == null ? IntPtr.Zero : cr.Handle);
-			return GLib.Object.GetObject (raw_ret, true) as Pango.Layout;
+			return Pango.CairoHelper.CreateLayout (cr);
 		}
 
-		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
-		static extern void pango_cairo_layout_path (IntPtr cr, IntPtr layout);
+		// [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
+		// static extern void pango_cairo_layout_path (IntPtr cr, IntPtr layout);
+		//
+		// public static void LayoutPath (this Cairo.Context cr, Pango.Layout layout)
+		// {
+		// 	pango_cairo_layout_path (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
+		// }
 
-		public static void LayoutPath (this Cairo.Context cr, Pango.Layout layout)
-		{
-			pango_cairo_layout_path (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
-		}
+		// [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
+		// static extern void pango_cairo_context_set_resolution (IntPtr pango_context, double dpi);
+		//
+		// public static void ContextSetResolution (this Pango.Context context, double dpi)
+		// {
+		// 	pango_cairo_context_set_resolution (context == null ? IntPtr.Zero : context.Handle, dpi);
+		// }
 
-		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
-		static extern void pango_cairo_context_set_resolution (IntPtr pango_context, double dpi);
-
-		public static void ContextSetResolution (this Pango.Context context, double dpi)
-		{
-			pango_cairo_context_set_resolution (context == null ? IntPtr.Zero : context.Handle, dpi);
-		}
-
-		[DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
-		static extern IntPtr pango_layout_get_context (IntPtr layout);
+		// [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
+		// static extern IntPtr pango_layout_get_context (IntPtr layout);
 
 		public static string GetColorString (Gdk.Color color)
 		{
 			return string.Format ("#{0:X02}{1:X02}{2:X02}", color.Red / 256, color.Green / 256, color.Blue / 256);
 		}
 
-		public static Pango.Context LayoutGetContext (this Pango.Layout layout)
-		{
-			IntPtr handle = pango_layout_get_context (layout.Handle);
-			return handle.Equals (IntPtr.Zero) ? null : GLib.Object.GetObject (handle) as Pango.Context;
-		}
-		
+		// public static Pango.Context LayoutGetContext (this Pango.Layout layout)
+		// {
+		// 	IntPtr handle = pango_layout_get_context (layout.Handle);
+		// 	return handle.Equals (IntPtr.Zero) ? null : GLib.Object.GetObject (handle) as Pango.Context;
+		// }
+
 		public static void DrawLine (this Cairo.Context cr, Cairo.Color color, double x1, double y1, double x2, double y2)
 		{
 			cr.SetSourceColor (color);
 			cr.MoveTo (x1, y1);
 			cr.LineTo (x2, y2);
 			cr.Stroke ();
 		}
-		
+
 		public static void Line (this Cairo.Context cr, double x1, double y1, double x2, double y2)
 		{
 			cr.MoveTo (x1, y1);
 			cr.LineTo (x2, y2);
 		}
-		
+
 		public static void SharpLineX (this Cairo.Context cr, double x1, double y1, double x2, double y2)
 		{
 			cr.MoveTo (x1 + 0.5, y1);
 			cr.LineTo (x2 + 0.5, y2);
 		}
-		
+
 		public static void SharpLineY (this Cairo.Context cr, double x1, double y1, double x2, double y2)
 		{
 			cr.MoveTo (x1, y1 + 0.5);

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
@@ -32,7 +32,9 @@
 using MonoDevelop.Ide.Gui;
 using System;
 using System.Linq;
+using Cairo;
 using MonoDevelop.Ide.Gui.Shell;
+using Rectangle = Gdk.Rectangle;
 
 namespace MonoDevelop.Components.DockNotebook
 {
@@ -82,7 +84,7 @@ public PlaceholderWindow (DockNotebookTab tab): base (Gtk.WindowType.Toplevel)
 			titleWindow.FocusOutEvent += delegate {
 				timeout = GLib.Timeout.Add (100, () => {
 					timeout = 0;
-					titleWindow.Close ();
+					titleWindow.ClosePlaceholder ();
 					return false;
 				});
 			};
@@ -236,7 +238,7 @@ protected override bool OnFocusOutEvent (EventFocus evt)
 		{
 			timeout = GLib.Timeout.Add (100, () => {
 				timeout = 0;
-				titleWindow.Close ();
+				titleWindow.ClosePlaceholder ();
 				return false;
 			});
 
@@ -248,18 +250,20 @@ protected override void OnRealized ()
 			base.OnRealized ();
 			GdkWindow.Opacity = 0.4;
 		}
-//		protected override bool OnExposeEvent (EventExpose evnt)
-//		{
-//			int w, h;
-//			GetSize (out w, out h);
-//
-//			using (var ctx = CairoHelper.Create (evnt.Window)) {
-//				ctx.SetSourceColor (new Cairo.Color (0.17, 0.55, 0.79));
-//				ctx.Rectangle (Allocation.ToCairoRect ());
-//				ctx.Fill ();
-//			}
-//			return true;
-//		}
+
+		protected override bool OnDrawn (Context ctx)
+		{
+
+			GetSize (out var w, out int h);
+
+			ctx.Save ();
+			ctx.SetSourceColor (new Cairo.Color (0.17, 0.55, 0.79));
+			ctx.Rectangle (Allocation.ToCairoRect ());
+			ctx.Fill ();
+			ctx.Restore ();
+
+			return true;
+		}
 
 		public void Relocate (int x, int y, int w, int h, bool animate)
 		{
@@ -437,7 +441,7 @@ public bool ControlPressed {
 		protected override bool OnKeyPressEvent (EventKey evnt)
 		{
 			if (evnt.Key == Gdk.Key.Escape)
-				Close ();
+				ClosePlaceholder ();
 			if (evnt.Key == Gdk.Key.Control_L)
 				controlKeyMask |= 1;
 			if (evnt.Key == Gdk.Key.Control_R)
@@ -461,17 +465,17 @@ protected override bool OnKeyReleaseEvent (EventKey evnt)
 
 		protected override bool OnButtonReleaseEvent (EventButton evnt)
 		{
-			Close ();
+			ClosePlaceholder ();
 			return base.OnButtonReleaseEvent (evnt);
 		}
 
 		protected override bool OnLeaveNotifyEvent (EventCrossing evnt)
 		{
-			Close ();
+			ClosePlaceholder ();
 			return base.OnLeaveNotifyEvent (evnt);
 		}
 
-		public void Close ()
+		public void ClosePlaceholder ()
 		{
 			Application.Invoke ((o, args) => {
 				placeholder.Destroy ();

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs
@@ -1148,17 +1148,16 @@ void Draw (Context ctx)
 			drawActive?.Invoke (ctx);
 
 			if (HasFocus) {
-				//Gtk.Style.PaintFocus (Style, ctx, State, /*focusRect,*/ this, "tab", focusRect.X, focusRect.Y, focusRect.Width, focusRect.Height);
+				StyleContext.RenderFocus (ctx, focusRect.X, focusRect.Y, focusRect.Width, focusRect.Height);
 			}
 		}
 
-//		protected override bool OnExposeEvent (EventExpose evnt)
-//		{
-//			using (var context = CairoHelper.Create (evnt.Window)) {
-//				Draw (context);
-//			}
-//			return base.OnExposeEvent (evnt);
-//		}
+		protected override bool OnDrawn (Context cr)
+		{
+			Draw (cr);
+
+			return base.OnDrawn (cr);
+		}
 
 		void DrawTab (Context ctx, DockNotebookTab tab, Gdk.Rectangle allocation, Gdk.Rectangle tabBounds, bool highlight, bool active, bool dragging, Pango.Layout la, bool focused)
 		{
@@ -1269,7 +1268,7 @@ static void DrawTabBackground (Widget widget, Context ctx, Gdk.Rectangle allocat
 		Pango.Layout CreateSizedLayout (bool active)
 		{
 			var la = new Pango.Layout (PangoContext);
-			//la.FontDescription = IdeServices.FontService.SansFont.Copy ();
+			la.FontDescription = IdeServices.FontService.SansFont.Copy ();
 			if (!Core.Platform.IsWindows)
 				la.FontDescription.Weight = Pango.Weight.Bold;
 			la.FontDescription.AbsoluteSize = Pango.Units.FromPixels (VerticalTextSize);