GTK graphics dialog: Default to scaling 100% when no scaling or size is given

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 5559aae990a01b4d9dc13d6fe9704de4fc0f3a96..41f94771b80c9072ec752e69865799a1b6276b64 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -7,6 +7,7 @@
  * \author Jean-Marc Lasgouttes
  * \author John Levon
  * \author Angus Leeming
+ * \author Juergen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -152,7 +153,7 @@ bool string2font(string const & data, LyXFont & font, bool & toggle)
 // the next two should probably go elsewhere
 // this give the position relative to (0, baseline) of outermost
 // paragraph
-Point coordOffset(DocIterator const & dit)
+Point coordOffset(DocIterator const & dit, bool boundary)
 {
        int x = 0;
        int y = 0;
@@ -162,37 +163,56 @@ Point coordOffset(DocIterator const & dit)
                CursorSlice const & sl = dit[i];
                int xx = 0;
                int yy = 0;
-               sl.inset().getCursorPos(sl, xx, yy);
+               //FIXME: the check for asMathInset() shouldn't be necessary
+               // but math insets do not return a sensible editable() state yet.
+               if (sl.inset().asMathInset() 
+                   || sl.inset().editable() == InsetBase::HIGHLY_EDITABLE)
+                       sl.inset().cursorPos(sl, boundary && ((i+1) == dit.depth()), xx, yy);
                x += xx;
                y += yy;
-               //lyxerr << "LCursor::getPos, i: " << i << " x: " << xx << " y: " << y << endl;
+               //lyxerr << "LCursor::getPos, i: "
+               // << i << " x: " << xx << " y: " << y << endl;
        }
 
        // Add contribution of initial rows of outermost paragraph
        CursorSlice const & sl = dit[0];
        Paragraph const & par = sl.text()->getPar(sl.pit());
        y -= par.rows()[0].ascent();
-       for (size_t rit = 0, rend = par.pos2row(sl.pos()); rit != rend; ++rit)
+#if 1
+       size_t rend;
+       if (sl.pos() > 0 && dit.depth() == 1) {
+               int pos = sl.pos();
+               if (pos && boundary)
+                       --pos;
+//             lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << std::endl;
+               rend = par.pos2row(pos);
+       } else
+               rend = par.pos2row(sl.pos());
+#else
+       size_t rend = par.pos2row(sl.pos());
+#endif
+       for (size_t rit = 0; rit != rend; ++rit)
                y += par.rows()[rit].height();
-       y += par.rows()[par.pos2row(sl.pos())].ascent();
-       x += dit.bottom().text()->cursorX(dit.bottom());
+       y += par.rows()[rend].ascent();
+       x += dit.bottom().text()->cursorX(dit.bottom(), boundary && dit.depth() == 1);
        // The following correction should not be there at all.
-       // The cusor looks much better with the -1, though.
+       // The cursor looks much better with the -1, though.
        --x;
        return Point(x, y);
 }
 
 
-Point getPos(DocIterator const & dit)
+Point getPos(DocIterator const & dit, bool boundary)
 {
        CursorSlice const & bot = dit.bottom();
-       CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(bot.text())->second;
+       CoordCache::InnerParPosCache const & cache =
+               theCoords.getParPos().find(bot.text())->second;
        CoordCache::InnerParPosCache::const_iterator it = cache.find(bot.pit());
        if (it == cache.end()) {
                //lyxerr << "cursor out of view" << std::endl;
                return Point(-1, -1);
        }
-       Point p = coordOffset(dit); // offset from outer paragraph
+       Point p = coordOffset(dit, boundary); // offset from outer paragraph
        p.y_ += it->second.y_;
        return p;
 }
@@ -213,55 +233,75 @@ CurStatus status(BufferView const * bv, DocIterator const & dit)
 
 namespace {
 
-bool gotoNextInset(LCursor & cur,
-                  vector<InsetBase_code> const & codes, 
+bool findNextInset(DocIterator & dit,
+                  vector<InsetBase_code> const & codes,
                   string const & contents)
 {
-       LCursor tmpcur = cur;
-       
-       while (tmpcur) {
-               InsetBase const * inset = tmpcur.nextInset();
-               if (inset 
-                   && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() 
+       DocIterator tmpdit = dit;
+
+       while (tmpdit) {
+               InsetBase const * inset = tmpdit.nextInset();
+               if (inset
+                   && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
                    && (contents.empty() ||
                        static_cast<InsetCommand const *>(inset)->getContents() == contents)) {
-                       cur = tmpcur;
+                       dit = tmpdit;
                        return true;
                }
-               tmpcur.forwardInset();
+               tmpdit.forwardInset();
        }
 
        return false;
 }
 
-}
+} // namespace anon
 
 
-void gotoInset(BufferView * bv, vector<InsetBase_code> const & codes, 
+bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
               bool same_content)
 {
        string contents;
-       LCursor tmpcur = bv->cursor();
-       tmpcur.forwardInset();
+       DocIterator tmpdit = dit;
+       tmpdit.forwardInset();
 
        if (same_content) {
-               InsetBase const * inset = tmpcur.nextInset();
-               if (inset 
+               InsetBase const * inset = tmpdit.nextInset();
+               if (inset
                    && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
                        contents = static_cast<InsetCommand const *>(inset)->getContents();
                }
        }
 
-       if (!gotoNextInset(tmpcur, codes, contents)) {
-               if (tmpcur != doc_iterator_begin(tmpcur.inset())) {
-                       tmpcur.reset(tmpcur.bottom().inset());
-                       if (!gotoNextInset(tmpcur, codes, contents)) 
-                               bv->cursor().message(_("No more insets"));
-               } else {
-                       bv->cursor().message(_("No more insets"));
-               }
+       if (!findNextInset(tmpdit, codes, contents)) {
+               if (dit.depth() != 1 || dit.pit() != 0 || dit.pos() != 0) {
+                       tmpdit  = doc_iterator_begin(tmpdit.bottom().inset());
+                       if (!findNextInset(tmpdit, codes, contents)) {
+                               return false;
+                       }
+               } else
+                       return false;
        }
        
+       dit = tmpdit;
+       return true;
+}
+
+
+void findInset(DocIterator & dit, InsetBase_code code, bool same_content)
+{
+       findInset(dit, vector<InsetBase_code>(1, code), same_content);
+}
+
+
+void gotoInset(BufferView * bv, vector<InsetBase_code> const & codes,
+              bool same_content)
+{
+       LCursor tmpcur = bv->cursor();
+       if (!findInset(tmpcur, codes, same_content)) {
+               bv->cursor().message(_("No more insets"));
+               return;
+       }
+
        tmpcur.clearSelection();
        bv->setCursor(tmpcur);
 }