src/Tools/jEdit/patches/gui_utilities
changeset 82570 b47b65bd707f
parent 82569 782519a6ebb4
equal deleted inserted replaced
82569:782519a6ebb4 82570:b47b65bd707f
     1 diff -ru jedit5.7.0/jEdit/org/gjt/sp/jedit/GUIUtilities.java jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/GUIUtilities.java
     1 diff -ru jedit5.7.0/jEdit/org/gjt/sp/jedit/GUIUtilities.java jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/GUIUtilities.java
     2 --- jedit5.7.0/jEdit/org/gjt/sp/jedit/GUIUtilities.java	2024-08-03 19:53:15.000000000 +0200
     2 --- jedit5.7.0/jEdit/org/gjt/sp/jedit/GUIUtilities.java	2024-08-03 19:53:15.000000000 +0200
     3 +++ jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/GUIUtilities.java	2025-04-22 22:11:53.770185212 +0200
     3 +++ jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/GUIUtilities.java	2025-04-23 14:28:53.149349418 +0200
     4 @@ -42,6 +42,8 @@
     4 @@ -42,6 +42,8 @@
     5  import java.net.URL;
     5  import java.net.URL;
     6  import java.util.*;
     6  import java.util.*;
     7  import java.util.List;
     7  import java.util.List;
     8 +import java.util.regex.Pattern;
     8 +import java.util.regex.Pattern;
    88 -						Font.PLAIN, font1.getSize());
    88 -						Font.PLAIN, font1.getSize());
    89 +				Font font2 = new Font("Isabelle DejaVu Sans Mono", Font.PLAIN, font1.getSize());
    89 +				Font font2 = new Font("Isabelle DejaVu Sans Mono", Font.PLAIN, font1.getSize());
    90  				FontRenderContext frc = new FontRenderContext(null, true, false);
    90  				FontRenderContext frc = new FontRenderContext(null, true, false);
    91  				float scale =
    91  				float scale =
    92  					font1.getLineMetrics("", frc).getHeight() / font2.getLineMetrics("", frc).getHeight();
    92  					font1.getLineMetrics("", frc).getHeight() / font2.getLineMetrics("", frc).getHeight();
    93 @@ -1107,6 +1124,11 @@
    93 @@ -1107,6 +1124,22 @@
    94  
    94  
    95  	//{{{ Colors and styles
    95  	//{{{ Colors and styles
    96  
    96  
       
    97 +	public static Color menuAcceleratorForeground(boolean selection) {
       
    98 +		Color color =
       
    99 +			UIManager.getColor(selection ?
       
   100 +				"MenuItem.acceleratorSelectionForeground" :
       
   101 +				"MenuItem.acceleratorForeground");
       
   102 +
       
   103 +		if (color == null) color = Color.black;
       
   104 +
       
   105 +		return color;
       
   106 +	}
       
   107 +
    97 +	public static boolean isDarkLaf()
   108 +	public static boolean isDarkLaf()
    98 +	{
   109 +	{
    99 +		return com.formdev.flatlaf.FlatLaf.isLafDark();
   110 +		return com.formdev.flatlaf.FlatLaf.isLafDark();
   100 +	}
   111 +	}
   101 +
   112 +
   102  	//{{{ getStyleString() method
   113  	//{{{ getStyleString() method
   103  	/**
   114  	/**
   104  	 * Converts a style into it's string representation.
   115  	 * Converts a style into it's string representation.
   105 @@ -1619,6 +1641,21 @@
   116 @@ -1619,6 +1652,21 @@
   106  	}
   117  	}
   107  	//}}}
   118  	//}}}
   108  
   119  
   109 +	//{{{ isPopupTrigger() method
   120 +	//{{{ isPopupTrigger() method
   110 +	/**
   121 +	/**