Fix window codeTemplate postion incorrect bug

jie-meng · Apr 17, 2018 · 513218a · 513218a
1 parent b10aa07
commit 513218a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/gui/aboutdialog.cpp b/src/gui/aboutdialog.cpp
@@ -28,7 +28,7 @@ void AboutDialog::init()
 
 void AboutDialog::initGui()
 {
-    plabel_version_ = new QLabel(tr("Version: 1.10.1"));
+    plabel_version_ = new QLabel(tr("Version: 1.10.2"));
     plabel_email_ = new QLabel(tr("Email: [email protected]"));
     plabel_github_ = createLinkLabel("Lunar on Github", "https://github.com/jie-meng/Lunar");
     plabel_wiki_ = createLinkLabel("Lunar Wiki", "https://github.com/jie-meng/Lunar/wiki");

diff --git a/src/gui/docview.cpp b/src/gui/docview.cpp
@@ -955,8 +955,14 @@ void DocView::codeTemplate()
             int end = 0;
             if (Extension::getInstance().templateFileInfo(it->second, index - (end_pos - start_pos), template_content, begin, end))
             {
+                int offset = 0;
+                if (platformInfo() == kPlatformWindows) {
+                    //On windows start_pos is not same as Unix, might caused by end of line '\r\n' not '\n'.
+                    offset = line;
+                }
+
                 ptext_edit_->replaceSelectedText(StdStringToQString(template_content));
-                ptext_edit_->setSelection(0, start_pos + begin, 0, start_pos + end);
+                ptext_edit_->setSelection(0, start_pos - offset + begin, 0, start_pos - offset + end);
             }
         }
     }