整理代码

Arona/src/arona_application.cpp

@@ -1,17 +1,4 @@
 #include "arona_application.h"
-#include "widget/main_frame.h"
-
-void arona_application::tick(float delta_time) {
-
-}
-
-void arona_application::init() {
-    application::init();
-}
-
-void arona_application::shutdown() {
-    application::shutdown();
-}
 
 arona_application* get_application() {
     return static_cast<arona_application*>(g_application);

Arona/src/arona_application.h

@@ -5,16 +5,6 @@
 class arona_application : public application {
 public:
     ~arona_application() override = default;
-
-    void tick(float delta_time) override;
-
-    void init() override;
-
-    void shutdown() override;
-
-protected:
-
-private:
 };
 
 inline arona_application* get_application();

Arona/src/entry/main.cpp

@@ -1,24 +1,12 @@
-#include <iostream>
-
 #include "arona_application.h"
 #include "gtkmm.h"
-
-class hello_world : public Gtk::Window {
-public:
-    hello_world() {
-        button_.set_margin(10);
-        button_.signal_clicked().connect(sigc::mem_fun(*this, &hello_world::on_button_clicked));
-        set_child(button_);
-    }
-private:
-    void on_button_clicked() {
-        std::cout << "hello, gtk!" << std::endl;
-    }
-    Gtk::Button button_;
-};
+#include "widget/main_window.h"
 
 int main(int argc, char* argv[]) {
-    auto app = Gtk::Application::create("org.gtkmm.example");
-    return app->make_window_and_run<hello_world>(argc, argv);
+    const auto& app = Gtk::Application::create("org.nanako.arona");
+    arona_application arona_app;
+    arona_app.init();
+    app->make_window_and_run<main_window>(argc, argv);
+    arona_app.shutdown();
+    return 0;
 }
-

Arona/src/widget/main_frame.cpp

@@ -1,4 +0,0 @@
-#include "main_frame.h"
-
-#include "workspace/workspace_window.h"
-#include "sample_manager/sample_manager_window.h"

Arona/src/widget/main_frame.h

@@ -1,5 +0,0 @@
-#pragma once
-
-class main_frame {
-
-};

Arona/src/widget/main_window.cpp

@@ -0,0 +1,6 @@
+#include "main_window.h"
+#include "spdlog/spdlog.h"
+
+void main_window::on_button_clicked() {
+    spdlog::info("Hello, world!");
+}

Arona/src/widget/main_window.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "gtkmm.h"
+
+class main_window : public Gtk::Window {
+public:
+    main_window() {
+        button_.set_margin(10);
+        button_.signal_clicked().connect(mem_fun(*this, &main_window::on_button_clicked));
+        label_.set_text("Hello, world!");
+
+        button_.set_child(label_);
+        set_child(button_);
+        set_title("Arona");
+    }
+private:
+    void on_button_clicked();
+
+    Gtk::Button button_;
+    Gtk::Label label_;
+};