Skip to content

Commit

Permalink
Fixes, wrap improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
harshad1 committed Jan 10, 2025
1 parent 342d83a commit 3237d18
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -595,18 +595,18 @@ private void updateSortSettings() {
final GsFileUtils.SortOrder globalOrder = _appSettings.getFolderSortOrder(null);
MarkorDialogFactory.showFolderSortDialog(getActivity(), _dopt.sortOrder, globalOrder,
(order) -> {
final File currentFolder = getCurrentFolder();

// Erase local sort order if local is unset
final File currentFolder = getCurrentFolder();
if (_dopt.sortOrder.isFolderLocal && !order.isFolderLocal) {
_appSettings.setFolderSortOrder(currentFolder, null);
}

// Set new sort order to folder or global as needed
_dopt.sortOrder = order;
_appSettings.setFolderSortOrder(order.isFolderLocal ? currentFolder : null, _dopt.sortOrder);

_dopt.sortOrder = order;
reloadCurrentFolder(); // Ui will be updated by onFsViewerDoUiUpdate after the load
// Ui will be updated by onFsViewerDoUiUpdate after the load
reloadCurrentFolder();
});
}
}
3 changes: 3 additions & 0 deletions app/src/main/res/layout/document__fragment__edit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/editor_bottom_margin"
android:breakStrategy="balanced"
android:lineBreakStyle="normal"
android:hyphenationFrequency="normalFast"
android:scrollbars="none"
android:textCursorDrawable="@drawable/cursor_accent" />
</net.gsantner.markor.frontend.DraggableScrollbarScrollView>
Expand Down

0 comments on commit 3237d18

Please sign in to comment.