Various changes based on review and tests.

Fix background editor actions not showing on first start. Don't show dash on start by default. Add license to arch.xml.
apache · Apr 4, 2024 · 4d93545 · 4d93545
1 parent b021f1f
commit 4d93545
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/nb/ide.dashboard/src/org/netbeans/modules/ide/dashboard/resources/layer.xml b/nb/ide.dashboard/src/org/netbeans/modules/ide/dashboard/resources/layer.xml
@@ -24,7 +24,7 @@
 
   <folder name="Dashboard">
     <folder name="Main">
-      <attr name="showOnStartup" boolvalue="true"/>
+      <attr name="showOnStartup" boolvalue="false"/>
       <file name="NetBeansWidget.shadow">
         <attr name="originalFile" stringvalue="Dashboard/Widgets/NetBeansWidget.instance"/>
         <attr name="position" intvalue="100"/>

diff --git a/platform/api.dashboard/arch.xml b/platform/api.dashboard/arch.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
   <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
 ]>

diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/EditorView.java b/platform/core.windows/src/org/netbeans/core/windows/view/EditorView.java
@@ -199,12 +199,10 @@ public EditorAreaComponent(EditorView editorView, WindowDnDManager windowDnDMana
 
         private void init() {
             setLayout(new BorderLayout());
-            // special background for XP style
-            String lfID = UIManager.getLookAndFeel().getID();
-//            if (lfID.equals("Windows")) {
-//                setBackground((Color)UIManager.get("nb_workplace_fill"));
-//            }
-
+            if (backgroundComponent != null) {
+                add(backgroundComponent, BorderLayout.CENTER);
+            }
+
             //listen to files being dragged over the editor area
             DropTarget dropTarget = new DropTarget( this, new DropTargetListener() {
                 @Override
@@ -493,6 +491,7 @@ private BackgroundActionButton(Action action) {
                 shortcut.setTitleFont(font.deriveFont(0.9f * font.getSize()));
             }
             setBorder(shortcut);
+            setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
             setAction(action);
         }