Selaa lähdekoodia

Re-add link colouring functionality and remove menu button for now

Billy Barrow 2 vuotta sitten
vanhempi
sitoutus
efee632257
2 muutettua tiedostoa jossa 15 lisäystä ja 13 poistoa
  1. 10 0
      src/DocumentView/MarkdownView.vala
  2. 5 13
      src/Window.vala

+ 10 - 0
src/DocumentView/MarkdownView.vala

@@ -26,6 +26,9 @@ namespace PpubViewer.DocumentView {
             markdown_view.link_activated.connect(url => link_clicked(url));
             clamp.child = markdown_view;
 
+            Gtk.Settings.get_default().notify["gtk-application-prefer-dark-theme"].connect(() => configure_tags());
+            configure_tags();
+
             append(scrolled_window);
         }
 
@@ -60,6 +63,13 @@ namespace PpubViewer.DocumentView {
             widget.append (image);
         }
 
+
+        private void configure_tags() {
+            var link = new LinkButton("");
+            markdown_view.tag_manager.update_link_colour(link.get_color());
+        }
+
+        
     }
 
 }

+ 5 - 13
src/Window.vala

@@ -52,10 +52,11 @@ namespace PpubViewer {
             forward_button.clicked.connect(go_forward);
             header_bar.pack_start(forward_button);
 
-            menu = new PopoverMenu.from_model(null);
-            menu_button = new Button.from_icon_name("open-menu-symbolic");
-            menu_button.clicked.connect(() => menu.popdown());
-            header_bar.pack_end(menu_button);
+            //  menu = new PopoverMenu.from_model(null);
+            //  header_bar.pack_end(menu);
+            //  menu_button = new Button.from_icon_name("open-menu-symbolic");
+            //  menu_button.clicked.connect(() => menu.popup());
+            //  header_bar.pack_end(menu_button);
 
             var zoom_squeezer = new Squeezer();
             zoom_squeezer.transition_type = SqueezerTransitionType.CROSSFADE;
@@ -70,8 +71,6 @@ namespace PpubViewer {
             document_view = new DocumentView.DocumentViewManager();
             document_view.link_clicked.connect(link_clicked);
             flap.content = document_view;
-            
-            Gtk.Settings.get_default().notify["gtk-application-prefer-dark-theme"].connect(() => configure_tags());
 
             properties_button.clicked.connect(() => {
                 flap.reveal_flap = !flap.reveal_flap;
@@ -133,7 +132,6 @@ namespace PpubViewer {
             document_view.load_asset(publication, publication.get_asset(file));
 
             Idle.add_once(() => {
-                configure_tags();
                 document_view.set_scroll_position(current_page.scroll_position);
                 return false;
             });
@@ -189,12 +187,6 @@ namespace PpubViewer {
             
         }
 
-        private void configure_tags() {
-            var link = new LinkButton("");
-            //  markdown_view.tag_manager.update_link_colour(link.get_color());
-            // TODO
-        }
-
         private void property_link_clicked(string file) {
             link_clicked(file);
             if(flap.folded) {