opt drawing and pixmap resizing

diff --git a/src/control/standard/hexview.cpp b/src/control/standard/hexview.cpp
index 12ef79a..e1556c5 100644 (file)
--- a/src/control/standard/hexview.cpp
+++ b/src/control/standard/hexview.cpp
@@ -113,6 +113,13 @@ HexView::HexView(QWidget *parent, Document *doc, Cursor *cur, Highlight *hi)
 {
 }
 
+void HexView::resizeEvent(QResizeEvent *rs)
+{
+       QSize size(min(rs->size().width(), config_.maxWidth()), rs->size().height());
+       QResizeEvent resize(size, rs->oldSize());
+       View::resizeEvent(&resize);
+}
+
 void HexView::refreshPixmap()
 {
        refreshPixmap(DRAW_ALL);
@@ -190,7 +197,7 @@ void HexView::refreshPixmap(int type, int line, int end)
 
        // Draw
        drawLines(painter, y, yt);
-       update(0, yt, width(), yCount * config_.byteHeight());
+       update(0, yt, min(width(), config_.maxWidth()), yCount * config_.byteHeight());
 }
 
 void HexView::drawLines(QPainter &painter, int y, int yt)
@@ -289,36 +296,7 @@ void HexView::mouseMoveEvent(QMouseEvent *ev)
                cur_->SelEnd = moveByMouse(ev->pos().x(), ev->pos().y());
                cur_->refreshSelected();
 
-               if (cur_->selMoved()) {
-                       //cur_->SelBegin - cur_->SelEnd
-                       //cur_->SelBegin - cur_->SelEndO
-                       quint64 b, e;
-                       if (cur_->SelBegin < cur_->SelEndO && cur_->SelBegin >= cur_->SelEnd ||
-                               cur_->SelBegin >= cur_->SelEndO && cur_->SelBegin < cur_->SelEnd) {
-                               qDebug("cross end:%lld endO:%lld", cur_->SelEnd, cur_->SelEndO);
-                               b = min(min(cur_->SelBegin, cur_->SelEnd), min(cur_->SelBegin, cur_->SelEndO));
-                               e = max(max(cur_->SelBegin, cur_->SelEnd), max(cur_->SelBegin, cur_->SelEndO));
-                       } else {
-                               /*
-                               cur_->SelBegin - cur_->SelEnd
-                               cur_->SelBegin - cur_->SelEndO
-                               */
-                               qDebug("minimum end:%lld endO:%lld", cur_->SelEnd, cur_->SelEndO);
-                               b = min(cur_->SelEnd, cur_->SelEndO);
-                               e = max(cur_->SelEnd, cur_->SelEndO);
-                       }
-                       /*
-                       const quint64 ob = min(cur_->SelBegin, cur_->SelEndO);
-                       const quint64 oe = max(cur_->SelBegin, cur_->SelEndO);
-                       const quint64 b = min(min(cur_->SelBegin, cur_->SelEnd), ob);
-                       const quint64 e = max(max(cur_->SelBegin, cur_->SelEnd), oe);
-                       */
-                       const int bL = b / 16 - cur_->Top;
-                       const int eL = e / 16 - cur_->Top;
-                       qDebug("bL:%d eL:%d", bL, eL);
-                       //refreshPixmap(DRAW_RANGE, bL, eL);
-                       refreshPixmap(DRAW_ALL);
-               }
+               drawSelected();
        }
 }
 
@@ -333,13 +311,7 @@ void HexView::mouseReleaseEvent(QMouseEvent *ev)
                cur_->Toggle = false;
                qDebug("mouse release begin:%lld end:%lld", cur_->SelBegin, cur_->SelEnd);
 
-               quint64 b = min(cur_->SelBegin, cur_->SelEnd);
-               quint64 e = max(cur_->SelBegin, cur_->SelEnd);
-               int bL = b / 16 - cur_->Top;
-               int eL = e / 16 - cur_->Top;
-               qDebug("bL:%d eL:%d", bL, eL);
-               refreshPixmap(DRAW_RANGE, bL, eL);
-               //refreshPixmap(DRAW_ALL);
+               drawSelected();
        }
 }
 
@@ -364,5 +336,26 @@ quint64 HexView::moveByMouse(int xx, int yy)
 }
 #undef MIN
 
+void HexView::drawSelected()
+{
+       if (cur_->selMoved()) {
+               quint64 b, e;
+               if (cur_->SelBegin < cur_->SelEndO && cur_->SelBegin >= cur_->SelEnd ||
+                       cur_->SelBegin >= cur_->SelEndO && cur_->SelBegin < cur_->SelEnd) {
+                       b = min(min(cur_->SelBegin, cur_->SelEnd), min(cur_->SelBegin, cur_->SelEndO));
+                       e = max(max(cur_->SelBegin, cur_->SelEnd), max(cur_->SelBegin, cur_->SelEndO));
+                       qDebug("cross end:%lld endO:%lld", cur_->SelEnd, cur_->SelEndO);
+               } else {
+                       b = min(cur_->SelEnd, cur_->SelEndO);
+                       e = max(cur_->SelEnd, cur_->SelEndO);
+                       qDebug("minimum end:%lld endO:%lld", cur_->SelEnd, cur_->SelEndO);
+               }
+               const int bL = b / 16 - cur_->Top;
+               const int eL = e / 16 - cur_->Top;
+               qDebug("bL:%d eL:%d", bL, eL);
+               //refreshPixmap(DRAW_RANGE, bL, eL);
+               refreshPixmap(DRAW_ALL);
+       }
+}
 
 }      // namespace

diff --git a/src/control/standard/hexview.h b/src/control/standard/hexview.h
index b4854b3..becedca 100644 (file)
--- a/src/control/standard/hexview.h
+++ b/src/control/standard/hexview.h
@@ -60,6 +60,10 @@ namespace Standard {
                {
                        return top_;
                }
+               inline int maxWidth() const
+               {
+                       return X(15) + ByteMargin.right() + Margin.right();
+               }
                inline int x(int i) const
                {
                        Q_ASSERT(0 <= i && i < Num);
@@ -92,9 +96,11 @@ namespace Standard {
                void refreshPixmap(int type, int = 0, int = 0);
                void drawLines(QPainter &painter, int y, int yt);
 
+               void resizeEvent(QResizeEvent *);
                void mousePressEvent(QMouseEvent*);
                void mouseMoveEvent(QMouseEvent*);
                void mouseReleaseEvent(QMouseEvent*);
+               void drawSelected();
 
                void byteToHex(uchar c, QString &h);
                quint64 moveByMouse(int x, int y);

diff --git a/src/control/view.cpp b/src/control/view.cpp
index eb4e027..0f0b18a 100644 (file)
--- a/src/control/view.cpp
+++ b/src/control/view.cpp
@@ -19,9 +19,12 @@ void View::paintEvent(QPaintEvent*)
        painter.drawPixmap(0, 0, pix_);
 }
 
-void View::resizeEvent(QResizeEvent *)
+void View::resizeEvent(QResizeEvent *rs)
 {
-       pix_ = QPixmap(size());
+       if (pix_.size().width() < rs->size().width() ||
+               pix_.size().height() < rs->size().height()) {
+               pix_ = QPixmap(rs->size());
+       }
        refreshPixmap();
 }