Skip to content

Commit 51c3eb0

Browse files
fedejeanneakurtakov
fedejeanne
authored and
akurtakov
committed
[Gtk4] Use gtk_widget_set_visible to replace gtk_widget_hide/show #228
Add helper methods that redirect to GTK/GTK3 in Widget for convenience. Contributes to #228
1 parent 4df99ba commit 51c3eb0

File tree

33 files changed

+160
-150
lines changed

33 files changed

+160
-150
lines changed

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
11-
* Contributors:
12-
* IBM Corporation - initial API and implementation
1310
*******************************************************************************/
1411

1512
/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
@@ -2275,6 +2272,16 @@ JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1widget_1get_1window)
22752272
}
22762273
#endif
22772274

2275+
#ifndef NO_gtk_1widget_1hide
2276+
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1hide)
2277+
(JNIEnv *env, jclass that, jlong arg0)
2278+
{
2279+
GTK3_NATIVE_ENTER(env, that, gtk_1widget_1hide_FUNC);
2280+
gtk_widget_hide((GtkWidget *)arg0);
2281+
GTK3_NATIVE_EXIT(env, that, gtk_1widget_1hide_FUNC);
2282+
}
2283+
#endif
2284+
22782285
#ifndef NO_gtk_1widget_1input_1shape_1combine_1region
22792286
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1input_1shape_1combine_1region)
22802287
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
@@ -2408,6 +2415,16 @@ JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1shape_1combine_1region)
24082415
}
24092416
#endif
24102417

2418+
#ifndef NO_gtk_1widget_1show
2419+
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1show)
2420+
(JNIEnv *env, jclass that, jlong arg0)
2421+
{
2422+
GTK3_NATIVE_ENTER(env, that, gtk_1widget_1show_FUNC);
2423+
gtk_widget_show((GtkWidget *)arg0);
2424+
GTK3_NATIVE_EXIT(env, that, gtk_1widget_1show_FUNC);
2425+
}
2426+
#endif
2427+
24112428
#ifndef NO_gtk_1widget_1size_1allocate
24122429
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1size_1allocate)
24132430
(JNIEnv *env, jclass that, jlong arg0, jobject arg1)

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
11-
* Contributors:
12-
* IBM Corporation - initial API and implementation
1310
*******************************************************************************/
1411

1512
/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
@@ -209,6 +206,7 @@ typedef enum {
209206
gtk_1widget_1get_1screen_FUNC,
210207
gtk_1widget_1get_1toplevel_FUNC,
211208
gtk_1widget_1get_1window_FUNC,
209+
gtk_1widget_1hide_FUNC,
212210
gtk_1widget_1input_1shape_1combine_1region_FUNC,
213211
gtk_1widget_1override_1font_FUNC,
214212
gtk_1widget_1remove_1accelerator_FUNC,
@@ -221,6 +219,7 @@ typedef enum {
221219
gtk_1widget_1set_1parent_1window_FUNC,
222220
gtk_1widget_1set_1redraw_1on_1allocate_FUNC,
223221
gtk_1widget_1shape_1combine_1region_FUNC,
222+
gtk_1widget_1show_FUNC,
224223
gtk_1widget_1size_1allocate_FUNC,
225224
gtk_1widget_1style_1get__J_3B_3IJ_FUNC,
226225
gtk_1widget_1style_1get__J_3B_3JJ_FUNC,

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
11-
* Contributors:
12-
* IBM Corporation - initial API and implementation
1310
*******************************************************************************/
1411

1512
/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
11-
* Contributors:
12-
* IBM Corporation - initial API and implementation
1310
*******************************************************************************/
1411

1512
/* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9352,16 +9352,6 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(gtk_1widget_1has_1focus)
93529352
}
93539353
#endif
93549354

9355-
#ifndef NO_gtk_1widget_1hide
9356-
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1hide)
9357-
(JNIEnv *env, jclass that, jlong arg0)
9358-
{
9359-
GTK_NATIVE_ENTER(env, that, gtk_1widget_1hide_FUNC);
9360-
gtk_widget_hide((GtkWidget *)arg0);
9361-
GTK_NATIVE_EXIT(env, that, gtk_1widget_1hide_FUNC);
9362-
}
9363-
#endif
9364-
93659355
#ifndef NO_gtk_1widget_1insert_1action_1group
93669356
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1insert_1action_1group)
93679357
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2)
@@ -9680,16 +9670,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1visible)
96809670
}
96819671
#endif
96829672

9683-
#ifndef NO_gtk_1widget_1show
9684-
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1show)
9685-
(JNIEnv *env, jclass that, jlong arg0)
9686-
{
9687-
GTK_NATIVE_ENTER(env, that, gtk_1widget_1show_FUNC);
9688-
gtk_widget_show((GtkWidget *)arg0);
9689-
GTK_NATIVE_EXIT(env, that, gtk_1widget_1show_FUNC);
9690-
}
9691-
#endif
9692-
96939673
#ifndef NO_gtk_1widget_1unparent
96949674
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1unparent)
96959675
(JNIEnv *env, jclass that, jlong arg0)

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ typedef enum {
748748
gtk_1widget_1grab_1focus_FUNC,
749749
gtk_1widget_1has_1default_FUNC,
750750
gtk_1widget_1has_1focus_FUNC,
751-
gtk_1widget_1hide_FUNC,
752751
gtk_1widget_1insert_1action_1group_FUNC,
753752
gtk_1widget_1is_1focus_FUNC,
754753
gtk_1widget_1mnemonic_1activate_FUNC,
@@ -774,7 +773,6 @@ typedef enum {
774773
gtk_1widget_1set_1valign_FUNC,
775774
gtk_1widget_1set_1vexpand_FUNC,
776775
gtk_1widget_1set_1visible_FUNC,
777-
gtk_1widget_1show_FUNC,
778776
gtk_1widget_1unparent_FUNC,
779777
gtk_1window_1fullscreen_FUNC,
780778
gtk_1window_1get_1default_1size_FUNC,

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,8 +2340,7 @@ public class GTK extends OS {
23402340
public static final native void gtk_widget_grab_focus(long widget);
23412341
/** @param widget cast=(GtkWidget *) */
23422342
public static final native boolean gtk_widget_has_focus(long widget);
2343-
/** @param widget cast=(GtkWidget *) */
2344-
public static final native void gtk_widget_hide(long widget);
2343+
23452344
/** @param widget cast=(GtkWidget *) */
23462345
public static final native boolean gtk_widget_is_focus(long widget);
23472346
/** @param widget cast=(GtkWidget *) */
@@ -2399,8 +2398,7 @@ public class GTK extends OS {
23992398
* @param height cast=(gint)
24002399
*/
24012400
public static final native void gtk_widget_set_size_request(long widget, int width, int height);
2402-
/** @param widget cast=(GtkWidget *) */
2403-
public static final native void gtk_widget_show(long widget);
2401+
24042402
/** @param widget cast=(GtkWidget *) */
24052403
public static final native boolean gtk_widget_activate(long widget);
24062404
/** @param widget cast=(GtkWidget *) */

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,5 +1089,9 @@ public class GTK3 {
10891089
public static final native int GdkEventWindowState_sizeof();
10901090
public static final native int GdkGeometry_sizeof();
10911091
public static final native int GdkWindowAttr_sizeof();
1092+
/** @param widget cast=(GtkWidget *) */
1093+
public static final native void gtk_widget_show(long widget);
1094+
/** @param widget cast=(GtkWidget *) */
1095+
public static final native void gtk_widget_hide(long widget);
10921096

10931097
}

‎bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,8 +709,13 @@ public void create (Composite parent, int style) {
709709
OS.g_signal_connect (WebKitGTK.webkit_web_context_get_default(), WebKitGTK.download_started, Proc3.getAddress (), DOWNLOAD_STARTED);
710710
}
711711

712-
GTK.gtk_widget_show (webView);
713-
GTK.gtk_widget_show (browser.handle);
712+
if (GTK.GTK4) {
713+
GTK.gtk_widget_set_visible(webView, true);
714+
GTK.gtk_widget_set_visible(browser.handle, true);
715+
} else {
716+
GTK3.gtk_widget_show(webView);
717+
GTK3.gtk_widget_show(browser.handle);
718+
}
714719

715720
// Webview 'title' property
716721
OS.g_signal_connect (webView, WebKitGTK.notify_title, Proc3.getAddress (), NOTIFY_TITLE);

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/SyncDialogUtil.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.function.*;
1818

1919
import org.eclipse.swt.internal.gtk.*;
20+
import org.eclipse.swt.internal.gtk3.*;
2021
import org.eclipse.swt.widgets.*;
2122

2223
/**
@@ -76,7 +77,11 @@ static public int run(Display display, long handle, boolean isNativeDialog) {
7677
if (isNativeDialog) {
7778
GTK.gtk_native_dialog_show(handle);
7879
} else {
79-
GTK.gtk_widget_show(handle);
80+
if (GTK.GTK4) {
81+
GTK.gtk_widget_set_visible(handle, true);
82+
} else {
83+
GTK3.gtk_widget_show(handle);
84+
}
8085
}
8186

8287
while (!display.isDisposed()) {

0 commit comments

Comments
 (0)