Skip to content

Commit a423d04

Browse files
author
gbr
committed
Initial fixes DPI scaling and FormEditor issues.
1 parent e64ae63 commit a423d04

File tree

26 files changed

+401
-296
lines changed

26 files changed

+401
-296
lines changed

.project

-17
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,7 @@
55
<projects>
66
</projects>
77
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.m2e.core.maven2Builder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.pde.ManifestBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.pde.SchemaBuilder</name>
20-
<arguments>
21-
</arguments>
22-
</buildCommand>
238
</buildSpec>
249
<natures>
25-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
26-
<nature>org.eclipse.pde.PluginNature</nature>
2710
</natures>
2811
</projectDescription>

META-INF/MANIFEST.MF

-7
This file was deleted.

net.certiv.tools.indentguide.feature/.project

-12
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,7 @@
55
<projects>
66
</projects>
77
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.pde.FeatureBuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.m2e.core.maven2Builder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
188
</buildSpec>
199
<natures>
20-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
21-
<nature>org.eclipse.pde.FeatureNature</nature>
2210
</natures>
2311
</projectDescription>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
bin.includes = feature.xml
2-
src.includes = feature.xml,\
3-
build.properties,\
4-
.project
2+
src.includes = feature.xml

net.certiv.tools.indentguide.feature/feature.xml

+14-10
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
<feature
33
id="net.certiv.tools.indentguide.feature"
44
label="IndentGuide"
5-
version="1.7.0.qualifier"
5+
version="1.8.0.qualifier"
66
provider-name="Certiv Analytis">
77

88
<description>
99
IndentGuide adds configurable indent guide lines in Eclipse text editors.
1010
</description>
1111

1212
<copyright>
13-
Copyright (c) 2006-2018 The IndentGuide Authors.
13+
Copyright (c) 2006-2023 The IndentGuide Authors.
1414
All rights reserved.
1515
</copyright>
1616

1717
<license url="">
1818
The MIT License (MIT)
1919

20-
Copyright (c) 2006-2021 the IndentGuide Authors.
20+
Copyright (c) 2006-2023 the IndentGuide Authors.
2121

2222
Permission is hereby granted, free of charge, to any person obtaining a copy
2323
of this software and associated documentation files (the &quot;Software&quot;), to deal
@@ -39,21 +39,25 @@ SOFTWARE.
3939
</license>
4040

4141
<url>
42-
<update label="Certiv Tools" url="https://www.certiv.net/update"/>
42+
<update label="Certiv Tools" url="https://www.certiv.net/updates"/>
4343
</url>
4444

4545
<requires>
46-
<import plugin="org.eclipse.ui" version="3.109.100" match="compatible"/>
47-
<import plugin="org.eclipse.core.runtime" version="3.14.0" match="compatible"/>
48-
<import plugin="org.eclipse.jface.text" version="3.13.0" match="compatible"/>
49-
<import plugin="org.eclipse.ui.workbench.texteditor" version="3.11.0" match="compatible"/>
50-
<import plugin="org.eclipse.e4.ui.css.swt.theme"/>
46+
<import plugin="org.eclipse.ui" version="3.201.200" match="compatible"/>
47+
<import plugin="org.eclipse.core.runtime" version="3.26.100" match="compatible"/>
48+
<import plugin="org.eclipse.jface.text" version="3.22.0" match="compatible"/>
49+
<import plugin="org.eclipse.ui.workbench.texteditor" version="3.16.600" match="compatible"/>
50+
<import plugin="org.eclipse.e4.core.services" version="2.3.400" match="compatible"/>
51+
<import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.13.200" match="compatible"/>
52+
<import plugin="org.eclipse.osgi.services" version="3.11.100" match="compatible"/>
53+
<import plugin="org.eclipse.ui.forms" version="3.11.500" match="compatible"/>
5154
</requires>
5255

5356
<plugin
5457
id="net.certiv.tools.indentguide"
5558
download-size="0"
5659
install-size="0"
57-
version="0.0.0"/>
60+
version="0.0.0"
61+
unpack="false"/>
5862

5963
</feature>
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
77
<packaging>eclipse-feature</packaging>
88

99
<parent>
1010
<groupId>net.certiv</groupId>
11-
<artifactId>net.certiv.tools.indentguide.parent</artifactId>
12-
<version>1.7.0-SNAPSHOT</version>
11+
<artifactId>net.certiv.tools.indentguide.parent</artifactId>
12+
<version>1.8.0-SNAPSHOT</version>
1313
</parent>
1414

1515
<artifactId>net.certiv.tools.indentguide.feature</artifactId>
16-
1716
</project>

net.certiv.tools.indentguide.plugin/.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</buildCommand>
2828
</buildSpec>
2929
<natures>
30+
<nature>org.eclipse.jdt.core.javanature</nature>
3031
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3132
<nature>org.eclipse.pde.PluginNature</nature>
32-
<nature>org.eclipse.jdt.core.javanature</nature>
3333
</natures>
3434
</projectDescription>

net.certiv.tools.indentguide.plugin/META-INF/MANIFEST.MF

+11-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: IndentGuide
44
Bundle-SymbolicName: net.certiv.tools.indentguide;singleton:=true
5-
Bundle-Version: 1.7.0.qualifier
5+
Bundle-Version: 1.8.0.qualifier
66
Bundle-Activator: net.certiv.tools.indentguide.Activator
7-
Require-Bundle: org.eclipse.ui;bundle-version="[3.109.100,4.0.0)",
8-
org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
9-
org.eclipse.jface.text;bundle-version="[3.13.0,4.0.0)",
10-
org.eclipse.ui.workbench.texteditor;bundle-version="[3.11.0,4.0.0)",
11-
org.eclipse.e4.core.services;bundle-version="2.3.0",
12-
org.eclipse.e4.ui.css.swt.theme;bundle-version="0.13.0",
13-
org.eclipse.osgi.services
14-
Bundle-RequiredExecutionEnvironment: JavaSE-11
157
Bundle-Vendor: Certiv Analytics
16-
Automatic-Module-Name: net.certiv.tools.indentguide
8+
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)",
9+
org.eclipse.e4.core.services;bundle-version="[2.3.400,3.0.0)",
10+
org.eclipse.e4.ui.css.swt.theme;bundle-version="[0.13.200,1.0.0)",
11+
org.eclipse.jface.text;bundle-version="[3.22.0,4.0.0)",
12+
org.eclipse.osgi.services;bundle-version="[3.11.100,4.0.0)",
13+
org.eclipse.ui;bundle-version="[3.201.200,4.0.0)",
14+
org.eclipse.ui.forms;bundle-version="[3.11.500,4.0.0)",
15+
org.eclipse.ui.workbench.texteditor;bundle-version="[3.16.600,4.0.0)"
16+
Bundle-RequiredExecutionEnvironment: JavaSE-11
17+
Automatic-Module-Name: net.certiv.tools.indentguide.singleton.true
1718
Bundle-ActivationPolicy: lazy

net.certiv.tools.indentguide.plugin/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ bin.includes = plugin.xml,\
44
.,\
55
META-INF/,\
66
OSGI-INF/,\
7-
attic/css/
7+
icons/
Loading
Loading

net.certiv.tools.indentguide.plugin/plugin.xml

-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
class="net.certiv.tools.indentguide.preferences.Initializer">
1818
</initializer>
1919
</extension>
20-
2120
<extension
2221
point="org.eclipse.ui.startup">
2322
<startup
2423
class="net.certiv.tools.indentguide.Starter">
2524
</startup>
2625
</extension>
2726

28-
2927
</plugin>

net.certiv.tools.indentguide.plugin/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
77
<packaging>eclipse-plugin</packaging>
88

99
<parent>
1010
<groupId>net.certiv</groupId>
1111
<artifactId>net.certiv.tools.indentguide.parent</artifactId>
12-
<version>1.7.0-SNAPSHOT</version>
12+
<version>1.8.0-SNAPSHOT</version>
1313
</parent>
1414

1515
<artifactId>net.certiv.tools.indentguide</artifactId>

net.certiv.tools.indentguide.plugin/src/net/certiv/tools/indentguide/Activator.java

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/******************************************************************************
2-
* Copyright (c) 2006-2021 The IndentGuide Authors.
2+
* Copyright (c) 2006-2023 The IndentGuide Authors.
33
* All rights reserved.
44
*
55
* This program and the accompanying materials are made available under the
@@ -39,7 +39,7 @@ public class Activator extends AbstractUIPlugin {
3939
private static Activator plugin;
4040

4141
private final IEclipsePreferences[] scopes = new IEclipsePreferences[2];
42-
private final EventHandler themeEventHandler = event -> {
42+
private final EventHandler themeChange = event -> {
4343
disposeLineColor();
4444
log("Theme change '%s'", event);
4545
};
@@ -51,22 +51,22 @@ public Activator() {
5151
}
5252

5353
/** Returns the shared instance */
54-
public static Activator getDefault() {
55-
return plugin;
56-
}
54+
public static Activator getDefault() { return plugin; }
5755

5856
@Override
5957
public void start(BundleContext context) throws Exception {
6058
super.start(context);
6159
plugin = this;
6260

61+
log("Indent guide: startup");
62+
6363
scopes[0] = InstanceScope.INSTANCE.getNode(EditorsID);
6464
scopes[1] = DefaultScope.INSTANCE.getNode(EditorsID);
6565

6666
IWorkbench wb = PlatformUI.getWorkbench();
6767
IEventBroker broker = wb.getService(IEventBroker.class);
6868
if (broker != null) {
69-
broker.subscribe(IThemeEngine.Events.THEME_CHANGED, themeEventHandler);
69+
broker.subscribe(IThemeEngine.Events.THEME_CHANGED, themeChange);
7070
}
7171
}
7272

@@ -75,12 +75,11 @@ public void stop(BundleContext context) throws Exception {
7575
IWorkbench wb = PlatformUI.getWorkbench();
7676
IEventBroker broker = wb.getService(IEventBroker.class);
7777
if (broker != null) {
78-
broker.unsubscribe(themeEventHandler);
78+
broker.unsubscribe(themeChange);
7979
}
8080

8181
disposeLineColor();
8282
scopes[0] = scopes[1] = null;
83-
8483
plugin = null;
8584
super.stop(context);
8685
}
@@ -99,9 +98,8 @@ public Color getColor() {
9998
}
10099

101100
/**
102-
* Returns {@code true} if the current theme is 'dark', defined as where the
103-
* foreground color is relatively darker than the background color. (black ->
104-
* '0'; white -> '255*3')
101+
* Returns {@code true} if the current theme is 'dark', defined as where the foreground color is
102+
* relatively darker than the background color. (black -> '0'; white -> '255*3')
105103
*/
106104
public boolean isDarkTheme() {
107105
RGB fg = getRawRGB(AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND);

0 commit comments

Comments
 (0)