🐛 Fix native window
This commit is contained in:
		@@ -6,19 +6,20 @@
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#include "flutter/generated_plugin_registrant.h"
 | 
			
		||||
#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
 | 
			
		||||
 | 
			
		||||
struct _MyApplication {
 | 
			
		||||
struct _MyApplication
 | 
			
		||||
{
 | 
			
		||||
  GtkApplication parent_instance;
 | 
			
		||||
  char** dart_entrypoint_arguments;
 | 
			
		||||
  char **dart_entrypoint_arguments;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
 | 
			
		||||
 | 
			
		||||
// Implements GApplication::activate.
 | 
			
		||||
static void my_application_activate(GApplication* application) {
 | 
			
		||||
  MyApplication* self = MY_APPLICATION(application);
 | 
			
		||||
  GtkWindow* window =
 | 
			
		||||
static void my_application_activate(GApplication *application)
 | 
			
		||||
{
 | 
			
		||||
  MyApplication *self = MY_APPLICATION(application);
 | 
			
		||||
  GtkWindow *window =
 | 
			
		||||
      GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
 | 
			
		||||
 | 
			
		||||
  // Use a header bar when running in GNOME as this is the common style used
 | 
			
		||||
@@ -30,32 +31,36 @@ static void my_application_activate(GApplication* application) {
 | 
			
		||||
  // if future cases occur).
 | 
			
		||||
  gboolean use_header_bar = TRUE;
 | 
			
		||||
#ifdef GDK_WINDOWING_X11
 | 
			
		||||
  GdkScreen* screen = gtk_window_get_screen(window);
 | 
			
		||||
  if (GDK_IS_X11_SCREEN(screen)) {
 | 
			
		||||
    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
 | 
			
		||||
    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
 | 
			
		||||
  GdkScreen *screen = gtk_window_get_screen(window);
 | 
			
		||||
  if (GDK_IS_X11_SCREEN(screen))
 | 
			
		||||
  {
 | 
			
		||||
    const gchar *wm_name = gdk_x11_screen_get_window_manager_name(screen);
 | 
			
		||||
    if (g_strcmp0(wm_name, "GNOME Shell") != 0)
 | 
			
		||||
    {
 | 
			
		||||
      use_header_bar = FALSE;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
#endif
 | 
			
		||||
  if (use_header_bar) {
 | 
			
		||||
    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
 | 
			
		||||
  if (use_header_bar)
 | 
			
		||||
  {
 | 
			
		||||
    GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
 | 
			
		||||
    gtk_widget_show(GTK_WIDGET(header_bar));
 | 
			
		||||
    gtk_header_bar_set_title(header_bar, "island");
 | 
			
		||||
    gtk_header_bar_set_show_close_button(header_bar, TRUE);
 | 
			
		||||
    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
 | 
			
		||||
  } else {
 | 
			
		||||
  }
 | 
			
		||||
  else
 | 
			
		||||
  {
 | 
			
		||||
    gtk_window_set_title(window, "island");
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  auto bdw = bitsdojo_window_from(window);
 | 
			
		||||
  bdw->setCustomFrame(true);
 | 
			
		||||
  gtk_window_set_default_size(window, 1280, 720);
 | 
			
		||||
  gtk_widget_show(GTK_WIDGET(window));
 | 
			
		||||
 | 
			
		||||
  g_autoptr(FlDartProject) project = fl_dart_project_new();
 | 
			
		||||
  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
 | 
			
		||||
 | 
			
		||||
  FlView* view = fl_view_new(project);
 | 
			
		||||
  FlView *view = fl_view_new(project);
 | 
			
		||||
  gtk_widget_show(GTK_WIDGET(view));
 | 
			
		||||
  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
 | 
			
		||||
 | 
			
		||||
@@ -65,16 +70,18 @@ static void my_application_activate(GApplication* application) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Implements GApplication::local_command_line.
 | 
			
		||||
static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
 | 
			
		||||
  MyApplication* self = MY_APPLICATION(application);
 | 
			
		||||
static gboolean my_application_local_command_line(GApplication *application, gchar ***arguments, int *exit_status)
 | 
			
		||||
{
 | 
			
		||||
  MyApplication *self = MY_APPLICATION(application);
 | 
			
		||||
  // Strip out the first argument as it is the binary name.
 | 
			
		||||
  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
 | 
			
		||||
 | 
			
		||||
  g_autoptr(GError) error = nullptr;
 | 
			
		||||
  if (!g_application_register(application, nullptr, &error)) {
 | 
			
		||||
     g_warning("Failed to register: %s", error->message);
 | 
			
		||||
     *exit_status = 1;
 | 
			
		||||
     return TRUE;
 | 
			
		||||
  if (!g_application_register(application, nullptr, &error))
 | 
			
		||||
  {
 | 
			
		||||
    g_warning("Failed to register: %s", error->message);
 | 
			
		||||
    *exit_status = 1;
 | 
			
		||||
    return TRUE;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  g_application_activate(application);
 | 
			
		||||
@@ -84,8 +91,9 @@ static gboolean my_application_local_command_line(GApplication* application, gch
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Implements GApplication::startup.
 | 
			
		||||
static void my_application_startup(GApplication* application) {
 | 
			
		||||
  //MyApplication* self = MY_APPLICATION(object);
 | 
			
		||||
static void my_application_startup(GApplication *application)
 | 
			
		||||
{
 | 
			
		||||
  // MyApplication* self = MY_APPLICATION(object);
 | 
			
		||||
 | 
			
		||||
  // Perform any actions required at application startup.
 | 
			
		||||
 | 
			
		||||
@@ -93,8 +101,9 @@ static void my_application_startup(GApplication* application) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Implements GApplication::shutdown.
 | 
			
		||||
static void my_application_shutdown(GApplication* application) {
 | 
			
		||||
  //MyApplication* self = MY_APPLICATION(object);
 | 
			
		||||
static void my_application_shutdown(GApplication *application)
 | 
			
		||||
{
 | 
			
		||||
  // MyApplication* self = MY_APPLICATION(object);
 | 
			
		||||
 | 
			
		||||
  // Perform any actions required at application shutdown.
 | 
			
		||||
 | 
			
		||||
@@ -102,13 +111,15 @@ static void my_application_shutdown(GApplication* application) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Implements GObject::dispose.
 | 
			
		||||
static void my_application_dispose(GObject* object) {
 | 
			
		||||
  MyApplication* self = MY_APPLICATION(object);
 | 
			
		||||
static void my_application_dispose(GObject *object)
 | 
			
		||||
{
 | 
			
		||||
  MyApplication *self = MY_APPLICATION(object);
 | 
			
		||||
  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
 | 
			
		||||
  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void my_application_class_init(MyApplicationClass* klass) {
 | 
			
		||||
static void my_application_class_init(MyApplicationClass *klass)
 | 
			
		||||
{
 | 
			
		||||
  G_APPLICATION_CLASS(klass)->activate = my_application_activate;
 | 
			
		||||
  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
 | 
			
		||||
  G_APPLICATION_CLASS(klass)->startup = my_application_startup;
 | 
			
		||||
@@ -116,9 +127,10 @@ static void my_application_class_init(MyApplicationClass* klass) {
 | 
			
		||||
  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void my_application_init(MyApplication* self) {}
 | 
			
		||||
static void my_application_init(MyApplication *self) {}
 | 
			
		||||
 | 
			
		||||
MyApplication* my_application_new() {
 | 
			
		||||
MyApplication *my_application_new()
 | 
			
		||||
{
 | 
			
		||||
  // Set the program name to the application ID, which helps various systems
 | 
			
		||||
  // like GTK and desktop environments map this running application to its
 | 
			
		||||
  // corresponding .desktop file. This ensures better integration by allowing
 | 
			
		||||
 
 | 
			
		||||
@@ -5,9 +5,6 @@
 | 
			
		||||
#include "flutter_window.h"
 | 
			
		||||
#include "utils.h"
 | 
			
		||||
 | 
			
		||||
#include <bitsdojo_window_windows/bitsdojo_window_plugin.h>
 | 
			
		||||
auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP);
 | 
			
		||||
 | 
			
		||||
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
 | 
			
		||||
                      _In_ wchar_t *command_line, _In_ int show_command)
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user