diff --git a/src/control/Control.cpp b/src/control/Control.cpp
index 2978de39..3231ad6d 100644
--- a/src/control/Control.cpp
+++ b/src/control/Control.cpp
@@ -345,9 +345,13 @@ void Control::initWindow(MainWindow* win)
// Disable undo buttons
undoRedoChanged();
- setViewColumns(settings->getViewColumns());
- setViewRows(settings->getViewRows());
-
+ if( settings->isViewFixedRows()){
+ setViewRows(settings->getViewRows());
+ }
+ else
+ {
+ setViewColumns(settings->getViewColumns());
+ }
setViewLayoutVert(settings->getViewLayoutVert());
setViewLayoutR2L(settings->getViewLayoutR2L());
@@ -1572,6 +1576,7 @@ void Control::setViewColumns(int numColumns)
XOJ_CHECK_TYPE(Control);
settings->setViewColumns(numColumns);
+ settings->setViewFixedRows(false);
ActionType action;
@@ -1587,7 +1592,7 @@ void Control::setViewColumns(int numColumns)
default: action = ACTION_SET_COLUMNS;
}
- fireActionSelected(GROUP_COLUMNS, action);
+ fireActionSelected(GROUP_FIXED_ROW_OR_COLS, action);
int currentPage = getCurrentPageNo();
win->getXournal()->layoutPages();
@@ -1599,6 +1604,8 @@ void Control::setViewRows(int numRows)
XOJ_CHECK_TYPE(Control);
settings->setViewRows(numRows);
+ settings->setViewFixedRows(true);
+
ActionType action;
@@ -1614,7 +1621,7 @@ void Control::setViewRows(int numRows)
default: action = ACTION_SET_ROWS;
}
- fireActionSelected(GROUP_ROWS, action);
+ fireActionSelected(GROUP_FIXED_ROW_OR_COLS, action);
int currentPage = getCurrentPageNo();
win->getXournal()->layoutPages();
diff --git a/src/enums/ActionGroup.enum.h b/src/enums/ActionGroup.enum.h
index 4f3e7e9e..f312c3d2 100644
--- a/src/enums/ActionGroup.enum.h
+++ b/src/enums/ActionGroup.enum.h
@@ -58,9 +58,7 @@ enum ActionGroup
GROUP_FILL,
- GROUP_COLUMNS,
-
- GROUP_ROWS,
+ GROUP_FIXED_ROW_OR_COLS,
GROUP_LAYOUT_HORIZONTAL,
diff --git a/src/enums/generated/ActionGroup.generated.cpp b/src/enums/generated/ActionGroup.generated.cpp
index c31e6f87..81211aa6 100644
--- a/src/enums/generated/ActionGroup.generated.cpp
+++ b/src/enums/generated/ActionGroup.generated.cpp
@@ -117,14 +117,9 @@ ActionGroup ActionGroup_fromString(string value)
return GROUP_FILL;
}
- if (value == "GROUP_COLUMNS")
+ if (value == "GROUP_FIXED_ROW_OR_COLS")
{
- return GROUP_COLUMNS;
- }
-
- if (value == "GROUP_ROWS")
- {
- return GROUP_ROWS;
+ return GROUP_FIXED_ROW_OR_COLS;
}
if (value == "GROUP_LAYOUT_HORIZONTAL")
@@ -250,14 +245,9 @@ string ActionGroup_toString(ActionGroup value)
return "GROUP_FILL";
}
- if (value == GROUP_COLUMNS)
- {
- return "GROUP_COLUMNS";
- }
-
- if (value == GROUP_ROWS)
+ if (value == GROUP_FIXED_ROW_OR_COLS)
{
- return "GROUP_ROWS";
+ return "GROUP_FIXED_ROW_OR_COLS";
}
if (value == GROUP_LAYOUT_HORIZONTAL)
diff --git a/ui/main.glade b/ui/main.glade
index c8cb066f..0d77e643 100644
--- a/ui/main.glade
+++ b/ui/main.glade
@@ -441,193 +441,211 @@
-
-
-
+
+