Skip to content

Commit aa64a42

Browse files
committed
changed toolbar height 40dp
1 parent 5bd17ad commit aa64a42

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

lib-n-ide/src/main/java/com/jecelyin/editor/v2/editor/Document.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@ public byte[] getMd5() {
358358
return mSourceMD5;
359359
}
360360

361+
public Buffer getBuffer() {
362+
return mBuffer;
363+
}
364+
361365
private final static class ReadFileTask extends AsyncTask<File, Void, SpannableStringBuilder> {
362366
private final ReadFileListener listener;
363367
private final FileReader fileReader;

lib-n-ide/src/main/java/com/jecelyin/editor/v2/editor/EditorDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public CharSequence getToolbarText() {
198198
if (mEditText != null && getCursorOffset() >= 0) {
199199
int cursorOffset = getCursorOffset();
200200
int line = mEditText.getLineForOffset(cursorOffset);
201-
cursor += line + ":" + cursorOffset;
201+
cursor += mDocument.getBuffer().getLineManager().getLineOfOffset(cursorOffset) + ":" + cursorOffset;
202202
}
203203
return String.format(Locale.US, "%s%s \t|\t %s \t %s \t %s", changed, title, encode, fileMode, cursor);
204204
}

lib-n-ide/src/main/java/com/jecelyin/editor/v2/manager/TabManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ public void onChanged() {
108108
mActivity.mEditorPager.setOffscreenPageLimit(mPagerAdapter.getCount());
109109
}
110110
});
111-
112-
// TODO: 25-Apr-18 show layout create new file
113111
}
114112

115113
public boolean newTab(File file) {

lib-n-ide/src/main/res/layout/activity_editor.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<com.ogaclejapan.smarttablayout.SmartTabLayout
2828
android:id="@+id/tab_layout"
2929
android:layout_width="match_parent"
30-
android:layout_height="40dp"
30+
android:layout_height="36dp"
3131
app:stl_clickable="true"
3232
app:stl_distributeEvenly="false"
3333
app:stl_dividerThickness="1dp"

lib-n-ide/src/main/res/values/dimens.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77

88
<dimen name="symbol_bar_height">36dp</dimen>
99
<dimen name="smallest_text_size">12sp</dimen>
10+
<dimen name="toolbar_height">40dp</dimen>
1011
</resources>

0 commit comments

Comments
 (0)