wilderjds
/
xournalpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1410 from lehmanju/add_scrollbar_option

Browse Source 
Add option to disable overlay scrolling
presentation
lehmanju 7 years ago committed by GitHub
parent 87c3c4305e d7ca7e876f
commit 7b1f9e89ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/control/settings/Settings.cpp
  2. 8
      src/control/settings/Settings.h
  3. 3
      src/gui/MainWindow.cpp
  4. 2
      src/gui/dialog/SettingsDialog.cpp
  5. 16
      ui/settings.glade

20
src/control/settings/Settings.cpp
Unescape View File

@ -84,6 +84,7 @@ void Settings::loadDefault()
this->highlightPosition = false;
this->darkTheme = false;
this->scrollbarHideType = SCROLLBAR_HIDE_NONE;
this->disableScrollbarFadeout = true;
//Set this for autosave frequency in minutes.
this->autosaveTimeout = 3;
@ -562,6 +563,10 @@ void Settings::parseItem(xmlDocPtr doc, xmlNodePtr cur)
this->scrollbarHideType = SCROLLBAR_HIDE_NONE;
}
}
else if (xmlStrcmp(name, (const xmlChar*) "disableScrollbarFadeout") == 0)
{
this->disableScrollbarFadeout = xmlStrcmp(value, (const xmlChar*) "true") ? false : true;
}
else if (xmlStrcmp(name, (const xmlChar*) "audioSampleRate") == 0)
{
this->audioSampleRate = tempg_ascii_strtod((const char *) value, NULL);
@ -963,6 +968,8 @@ void Settings::save()
WRITE_BOOL_PROP(highlightPosition);
WRITE_BOOL_PROP(darkTheme);
WRITE_BOOL_PROP(disableScrollbarFadeout);
if (this->scrollbarHideType == SCROLLBAR_HIDE_BOTH)
{
saveProperty((const char*) "scrollbarHideType", "both", root);
@ -980,7 +987,6 @@ void Settings::save()
saveProperty((const char*) "scrollbarHideType", "none", root);
}
WRITE_BOOL_PROP(autoloadPdfXoj);
WRITE_COMMENT("Hides scroolbars in the main window, allowed values: \"none\", \"horizontal\", \"vertical\", \"both\"");
@ -2579,6 +2585,18 @@ int Settings::getDeviceClassForDevice(const string& deviceName, GdkInputSource d
}
}
bool Settings::isScrollbarFadeoutDisabled()
{
return disableScrollbarFadeout;
}
void Settings::setScrollbarFadeoutDisabled(bool disable)
{
if (disableScrollbarFadeout == disable) return;
disableScrollbarFadeout = disable;
save();
}
//////////////////////////////////////////////////
SAttribute::SAttribute()

8
src/control/settings/Settings.h
Unescape View File

@ -308,6 +308,9 @@ public:
ScrollbarHideType getScrollbarHideType();
void setScrollbarHideType(ScrollbarHideType type);
bool isScrollbarFadeoutDisabled();
void setScrollbarFadeoutDisabled(bool disable);
string getDefaultSaveName();
void setDefaultSaveName(string name);
@ -539,6 +542,11 @@ private:
*/
ScrollbarHideType scrollbarHideType;
/**
* Disable scrollbar fade out (overlay scrolling)
*/
bool disableScrollbarFadeout;
/**
* The selected Toolbar name
*/

3
src/gui/MainWindow.cpp
Unescape View File

@ -508,6 +508,9 @@ void MainWindow::updateScrollbarSidebarPosition()
gtk_widget_set_visible(gtk_scrolled_window_get_hscrollbar(scrolledWindow), !(type & SCROLLBAR_HIDE_HORIZONTAL));
gtk_widget_set_visible(gtk_scrolled_window_get_vscrollbar(scrolledWindow), !(type & SCROLLBAR_HIDE_VERTICAL));
gtk_scrolled_window_set_overlay_scrolling(scrolledWindow,
!control->getSettings()->isScrollbarFadeoutDisabled());
}
GtkWidget* sidebar = get("sidebar");

2
src/gui/dialog/SettingsDialog.cpp
Unescape View File

@ -253,6 +253,7 @@ void SettingsDialog::load()
loadCheckbox("cbDarkTheme", settings->isDarkTheme());
loadCheckbox("cbHideHorizontalScrollbar", settings->getScrollbarHideType() & SCROLLBAR_HIDE_HORIZONTAL);
loadCheckbox("cbHideVerticalScrollbar", settings->getScrollbarHideType() & SCROLLBAR_HIDE_VERTICAL);
loadCheckbox("cbDisableScrollbarFadeout", settings->isScrollbarFadeoutDisabled());
loadCheckbox("cbTouchWorkaround", settings->isTouchWorkaround());
loadCheckbox("cbNewInputSystem", settings->getExperimentalInputSystemEnabled());
loadCheckbox("cbInputSystemTPCButton", settings->getInputSystemTPCButtonEnabled());
@ -533,6 +534,7 @@ void SettingsDialog::save()
settings->setExperimentalInputSystemEnabled(getCheckbox("cbNewInputSystem"));
settings->setInputSystemTPCButtonEnabled(getCheckbox("cbInputSystemTPCButton"));
settings->setInputSystemDrawOutsideWindowEnabled(getCheckbox("cbInputSystemDrawOutsideWindow"));
settings->setScrollbarFadeoutDisabled(getCheckbox("cbDisableScrollbarFadeout"));
auto scrollbarHideType =
static_cast<std::make_unsigned<std::underlying_type<ScrollbarHideType>::type>::type>(SCROLLBAR_HIDE_NONE);

16
ui/settings.glade
Unescape View File

@ -2273,7 +2273,6 @@ This also enables touch drawing.&lt;/i&gt;</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@ -2289,7 +2288,6 @@ This also enables touch drawing.&lt;/i&gt;</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@ -2298,6 +2296,20 @@ This also enables touch drawing.&lt;/i&gt;</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cbDisableScrollbarFadeout">
<property name="label" translatable="yes">Disable scrollbar fade out</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>

Write Preview
Loading…
Cancel
Save