From 2968da7a540b2974b41d2f8242c043d49c845238 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Thu, 12 Nov 2015 13:45:53 +0100
Subject: [PATCH] Dialog::message is now Gtk::MessageDialog.

---
 src/cmake.cc   |  1 -
 src/dialogs.cc | 23 +++--------------------
 src/dialogs.h  |  7 +------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/cmake.cc b/src/cmake.cc
index 20ed316..3e2f1c9 100644
--- a/src/cmake.cc
+++ b/src/cmake.cc
@@ -47,7 +47,6 @@ CMake::CMake(const boost::filesystem::path &path) {
 
 bool CMake::create_compile_commands(const boost::filesystem::path &path) {
   Dialog::Message message("Creating "+path.string()+"/compile_commands.json");
-  message.wait_until_drawn();
   auto exit_code=Singleton::terminal->execute(Singleton::config->terminal.cmake_command+" . -DCMAKE_EXPORT_COMPILE_COMMANDS=ON", path);
   message.hide();
   if(exit_code==EXIT_SUCCESS) {
diff --git a/src/dialogs.cc b/src/dialogs.cc
index 293b561..9f17204 100644
--- a/src/dialogs.cc
+++ b/src/dialogs.cc
@@ -17,31 +17,14 @@ namespace sigc {
 #endif
 }
 
-Dialog::Message::Message(const std::string &text): Gtk::Window(Gtk::WindowType::WINDOW_POPUP), label(text) {
-  auto font_desc=label.get_pango_context()->get_font_description();
-  font_desc.set_size(static_cast<int>(round(static_cast<double>(font_desc.get_size())*1.25)));
-  label.get_pango_context()->set_font_description(font_desc);
-  add(label);
-  
-  property_decorated()=false;
-  set_accept_focus(false);
-  set_skip_taskbar_hint(true);
-  
+Dialog::Message::Message(const std::string &text): Gtk::MessageDialog(text, false, Gtk::MessageType::MESSAGE_INFO, Gtk::ButtonsType::BUTTONS_NONE, true) {
   auto g_application=g_application_get_default();
   auto gio_application=Glib::wrap(g_application, true);
   auto application=Glib::RefPtr<Application>::cast_static(gio_application);
   set_transient_for(*application->window);
   set_position(Gtk::WindowPosition::WIN_POS_CENTER_ON_PARENT);
-  label.signal_draw().connect([this](const Cairo::RefPtr<Cairo::Context>& cr) {
-    label_drawn=true;
-    return false;
-  });
-  show_all();
-}
-
-void Dialog::Message::wait_until_drawn() {
-  while(!label_drawn)
-    g_main_context_iteration(NULL, false);
+  
+  show_now();
 }
 
 std::string Dialog::gtk_dialog(const std::string &title,
diff --git a/src/dialogs.h b/src/dialogs.h
index 446cc03..68e5d19 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -13,14 +13,9 @@ public:
   static std::string new_folder();
   static std::string save_file_as(const boost::filesystem::path &file_path);
   
-  class Message : public Gtk::Window {
+  class Message : public Gtk::MessageDialog {
   public:
     Message(const std::string &text);
-    
-    void wait_until_drawn();
-  private:
-    Gtk::Label label;
-    bool label_drawn=false;
   };
   
 private: