Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Override the OSX scrollbar behavior for the image panel. #1209

Merged
merged 1 commit into from
Oct 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions gapic/src/main/com/google/gapid/widgets/ImagePanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static com.google.gapid.widgets.Widgets.createToggleToolItem;
import static com.google.gapid.widgets.Widgets.createToolItem;
import static com.google.gapid.widgets.Widgets.withSpans;
import static org.eclipse.swt.widgets.SwtUtil.disableAutoHideScrollbars;

import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
Expand Down Expand Up @@ -440,6 +441,7 @@ public ImageComponent(Composite parent, Theme theme, Consumer<AlphaWarning> show
boolean naturallyFlipped) {
super(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.NO_BACKGROUND);
setLayout(new FillLayout(SWT.VERTICAL));
disableAutoHideScrollbars(this);

this.showAlphaWarning = showAlphaWarning;
this.naturallyFlipped = naturallyFlipped;
Expand Down
25 changes: 25 additions & 0 deletions gapic/src/platform/linux/org/eclipse/swt/widgets/SwtUtil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (C) 2017 Google Inc.
*
* Licensed 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.
*/
package org.eclipse.swt.widgets;

public class SwtUtil {
private SwtUtil() {
}

public static void disableAutoHideScrollbars(@SuppressWarnings("unused") Scrollable widget) {
// Do nothing.
}
}
31 changes: 31 additions & 0 deletions gapic/src/platform/osx/org/eclipse/swt/widgets/SwtUtil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* Copyright (C) 2017 Google Inc.
*
* Licensed 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.
*/
package org.eclipse.swt.widgets;

import org.eclipse.swt.internal.cocoa.OS;

public class SwtUtil {
private SwtUtil() {
}

public static void disableAutoHideScrollbars(Scrollable widget) {
if (OS.VERSION >= 0x1070) {
OS.objc_msgSend(widget.scrollView.id,
OS.sel_registerName("setScrollerStyle:"), 0 /* NSScrollerStyleLegacy */);
widget.scrollView.setAutohidesScrollers(false);
}
}
}
25 changes: 25 additions & 0 deletions gapic/src/platform/windows/org/eclipse/swt/widgets/SwtUtil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (C) 2017 Google Inc.
*
* Licensed 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.
*/
package org.eclipse.swt.widgets;

public class SwtUtil {
private SwtUtil() {
}

public static void disableAutoHideScrollbars(@SuppressWarnings("unused") Scrollable widget) {
// Do nothing.
}
}