1
0
Kandrashin Denis 13 жил өмнө
parent
commit
50c9d389b8

+ 1 - 0
source/fb2main.cpp

@@ -19,6 +19,7 @@ Fb2MainWindow::Fb2MainWindow()
     setCurrentFile();
     createText();
     createTree();
+    textEdit->setHtml("<body/>");
 }
 
 Fb2MainWindow::Fb2MainWindow(const QString &filename, ViewMode mode)

+ 1 - 1
source/fb2read.cpp

@@ -132,7 +132,7 @@ Fb2ReadHandler::HeadHandler::HeadHandler(Fb2ReadWriter &writer, const QString &n
     if (hide) m_writer.writeAttribute("style", "display:none");
     int count = atts.count();
     for (int i = 0; i < count; i++) {
-        m_writer.writeAttribute("fb2_" + atts.qName(i), atts.value(i));
+        m_writer.writeAttribute("fb2:" + atts.qName(i), atts.value(i));
     }
 }
 

+ 2 - 0
source/fb2view.cpp

@@ -78,6 +78,7 @@ QString Fb2WebView::toBodyXml()
 
 void Fb2WebView::fixContents()
 {
+    m_empty = false;
     foreach (QWebElement span, doc().findAll("span.apple-style-span[style]")) {
         span.removeAttribute("style");
     }
@@ -90,6 +91,7 @@ void Fb2WebView::linkHovered(const QString &link, const QString &title, const QS
 
 void Fb2WebView::load(const QString &filename)
 {
+    m_empty = false;
     if (m_thread) return;
     m_thread = new Fb2ReadThread(this, filename);
     m_thread->start();

+ 5 - 1
source/fb2view.h

@@ -16,7 +16,7 @@ class Fb2BaseWebView : public QWebView
 
 public:
     Fb2BaseWebView(QWidget* parent = 0)
-        : QWebView(parent)
+        : QWebView(parent), m_empty(true)
     {
           m_timer.setInterval(100);
           m_timer.setSingleShot(true);
@@ -32,10 +32,14 @@ protected slots:
 
 protected:
      void resizeEvent(QResizeEvent* event) {
+          if (m_empty) return QWebView::resizeEvent(event);
           if (!m_timer.isActive()) m_size = event->oldSize();
           m_timer.start();
      }
 
+protected:
+    bool m_empty;
+
 private:
     QTimer m_timer;
     QSize m_size;