Skip to content
Snippets Groups Projects
Commit f833dc67 authored by Johannes Eder's avatar Johannes Eder
Browse files

Merge branch '4061' into 'master'

Win10: Use dark gray instead of black for selected toggle button

See merge request !128
parents 4135b811 699f597e
No related branches found
No related tags found
1 merge request!128Win10: Use dark gray instead of black for selected toggle button
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
} }
.toggle-button:selected { .toggle-button:selected {
-fx-background-color: black; -fx-background-color: #7c7c7c;
-fx-text-fill: white; -fx-text-fill: white;
} }
......
...@@ -5,7 +5,7 @@ DynamicTreeContentProviderBase.java 91896b1fb5104d126544c44c1ff8c30f2a13a8d6 GRE ...@@ -5,7 +5,7 @@ DynamicTreeContentProviderBase.java 91896b1fb5104d126544c44c1ff8c30f2a13a8d6 GRE
DynamicTreeItem.java 7486071d20e896d6ca9a9101bf105caccf3656d0 GREEN DynamicTreeItem.java 7486071d20e896d6ca9a9101bf105caccf3656d0 GREEN
DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 GREEN DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 GREEN
DynamicTreeTableUIProviderBase.java 1078bd28a6bce5a5a2c60500f2aa1d8b1fdd341b GREEN DynamicTreeTableUIProviderBase.java 1078bd28a6bce5a5a2c60500f2aa1d8b1fdd341b GREEN
DynamicTreeTableViewer.java ea4ac3530edfa179cfce53bdd7e3a7ae80c435e4 GREEN DynamicTreeTableViewer.java d5f12bda6fa19b4ada3bddf9b7320c3e5393cdf7 GREEN
DynamicTreeUIProviderBase.java 82d3c051213f0147f4c67ad247a08696cee73110 GREEN DynamicTreeUIProviderBase.java 82d3c051213f0147f4c67ad247a08696cee73110 GREEN
DynamicTreeViewer.java e58d2cf7239e45f1b790ce9770a8a8649b1b5fb9 GREEN DynamicTreeViewer.java e58d2cf7239e45f1b790ce9770a8a8649b1b5fb9 GREEN
DynamicTreeViewerBase.java a2013538b62d86f6a09efdf2cd78babac2072484 GREEN DynamicTreeViewerBase.java a2013538b62d86f6a09efdf2cd78babac2072484 GREEN
......
...@@ -23,6 +23,7 @@ import java.util.function.Supplier; ...@@ -23,6 +23,7 @@ import java.util.function.Supplier;
import java.util.stream.Stream; import java.util.stream.Stream;
import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleObjectProperty;
import javafx.scene.control.Label;
import javafx.scene.control.SelectionMode; import javafx.scene.control.SelectionMode;
import javafx.scene.control.TreeItem; import javafx.scene.control.TreeItem;
import javafx.scene.control.TreeTableColumn; import javafx.scene.control.TreeTableColumn;
...@@ -97,6 +98,7 @@ public final class DynamicTreeTableViewer<T> extends DynamicTreeViewerBase<T> { ...@@ -97,6 +98,7 @@ public final class DynamicTreeTableViewer<T> extends DynamicTreeViewerBase<T> {
view.setRoot(rootItem); view.setRoot(rootItem);
view.setShowRoot(showRoot); view.setShowRoot(showRoot);
view.setEditable(true); view.setEditable(true);
view.setPlaceholder(new Label(""));
view.setRowFactory(new Callback<TreeTableView<T>, TreeTableRow<T>>() { view.setRowFactory(new Callback<TreeTableView<T>, TreeTableRow<T>>() {
@Override @Override
public TreeTableRow<T> call(TreeTableView<T> param) { public TreeTableRow<T> call(TreeTableView<T> param) {
......
ErrorViewFXLayoutController.java 382b8014acf4b0c625817d6279dfcdd670296cb2 GREEN ErrorViewFXLayoutController.java 88da2bc5a552e168733e3b07c78c6c7c8ce57eb0 GREEN
ErrorViewFXViewPart.java f620022aef647d7a019be8afc5351fabde05dcee GREEN ErrorViewFXViewPart.java 5952131056eb8fa8630cad84080a04720fd04bc1 GREEN
MarkerViewFXContentProvider.java ecf92449414b2b8648ad151bc932189baa23dc12 GREEN MarkerViewFXContentProvider.java ecf92449414b2b8648ad151bc932189baa23dc12 GREEN
MarkerViewFXUIProvider.java c5719d95ac7bd5605fff65d6150eca8b9ca6fc02 GREEN MarkerViewFXUIProvider.java c5719d95ac7bd5605fff65d6150eca8b9ca6fc02 GREEN
...@@ -45,7 +45,6 @@ import javafx.scene.layout.BorderPane; ...@@ -45,7 +45,6 @@ import javafx.scene.layout.BorderPane;
* *
* @author abid * @author abid
*/ */
public class ErrorViewFXLayoutController extends CompositeFXControllerBase<Node, Node> { public class ErrorViewFXLayoutController extends CompositeFXControllerBase<Node, Node> {
/** Debug Button */ /** Debug Button */
......
...@@ -21,7 +21,7 @@ import java.util.Map; ...@@ -21,7 +21,7 @@ import java.util.Map;
import org.fortiss.tooling.common.ui.javafx.AF3FXViewPart; import org.fortiss.tooling.common.ui.javafx.AF3FXViewPart;
import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity; import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
/** /**
* JavaFX view part of the Marker View. * JavaFX view part of the Marker View.
* *
* Wrapper for the {@link ErrorViewFXViewPart}. This class can be referenced in the * Wrapper for the {@link ErrorViewFXViewPart}. This class can be referenced in the
...@@ -29,7 +29,6 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity; ...@@ -29,7 +29,6 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
* *
* @author abid * @author abid
*/ */
public class ErrorViewFXViewPart extends AF3FXViewPart { public class ErrorViewFXViewPart extends AF3FXViewPart {
/** The classes ID. */ /** The classes ID. */
...@@ -39,7 +38,6 @@ public class ErrorViewFXViewPart extends AF3FXViewPart { ...@@ -39,7 +38,6 @@ public class ErrorViewFXViewPart extends AF3FXViewPart {
private static Map<ESeverity, Boolean> toggleState = new HashMap<ESeverity, Boolean>(); private static Map<ESeverity, Boolean> toggleState = new HashMap<ESeverity, Boolean>();
/** Constructor. */ /** Constructor. */
public ErrorViewFXViewPart() throws Exception { public ErrorViewFXViewPart() throws Exception {
super(new ErrorViewFXLayoutController(toggleState), null); super(new ErrorViewFXLayoutController(toggleState), null);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment