From 7e457b98c32f58e7f9529878a4e76832aaa80368 Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Tue, 29 Dec 2020 23:48:07 +0200 Subject: [PATCH] Terminal: Remove redundant scroll length settings option This is no longer needed as a global one is now available under mouse settings. --- Applications/Terminal/main.cpp | 12 ------------ Base/home/anon/.config/Terminal.ini | 1 - Libraries/LibVT/TerminalWidget.cpp | 6 ------ Libraries/LibVT/TerminalWidget.h | 1 - 4 files changed, 20 deletions(-) diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp index 7b01327b38..30c607393e 100644 --- a/Applications/Terminal/main.cpp +++ b/Applications/Terminal/main.cpp @@ -233,18 +233,6 @@ static RefPtr create_settings_window(TerminalWidget& terminal) slider.set_range(0, 255); slider.set_value(terminal.opacity()); - auto& spinbox_container = settings.add("Scroll length"); - spinbox_container.set_layout(); - spinbox_container.layout()->set_margins({ 6, 16, 6, 6 }); - spinbox_container.set_fixed_height(46); - - auto& spinbox = spinbox_container.add(); - spinbox.set_min(1); - spinbox.set_value(terminal.scroll_length()); - spinbox.on_change = [&terminal](int value) { - terminal.set_scroll_length(value); - }; - auto& history_size_spinbox_container = settings.add("Maximum scrollback history lines"); history_size_spinbox_container.set_layout(); history_size_spinbox_container.layout()->set_margins({ 6, 16, 6, 6 }); diff --git a/Base/home/anon/.config/Terminal.ini b/Base/home/anon/.config/Terminal.ini index a3a736cfce..3cdf124fb5 100644 --- a/Base/home/anon/.config/Terminal.ini +++ b/Base/home/anon/.config/Terminal.ini @@ -3,4 +3,3 @@ Command= [Window] Opacity=255 Bell=Visible -ScrollLength=4 diff --git a/Libraries/LibVT/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp index b03aa23c5b..d7ffcfbc7c 100644 --- a/Libraries/LibVT/TerminalWidget.cpp +++ b/Libraries/LibVT/TerminalWidget.cpp @@ -112,7 +112,6 @@ TerminalWidget::TerminalWidget(int ptm_fd, bool automatic_size_policy, RefPtron_change = [this](int) { force_repaint(); }; - set_scroll_length(m_config->read_num_entry("Window", "ScrollLength", 4)); dbgln("Load config file from {}", m_config->file_name()); m_cursor_blink_timer->set_interval(m_config->read_num_entry("Text", @@ -843,11 +842,6 @@ int TerminalWidget::scroll_length() const return m_scrollbar->step(); } -void TerminalWidget::set_scroll_length(int length) -{ - m_scrollbar->set_step(length); -} - String TerminalWidget::selected_text() const { StringBuilder builder; diff --git a/Libraries/LibVT/TerminalWidget.h b/Libraries/LibVT/TerminalWidget.h index 195e3c4a3f..6462740759 100644 --- a/Libraries/LibVT/TerminalWidget.h +++ b/Libraries/LibVT/TerminalWidget.h @@ -89,7 +89,6 @@ public: bool is_scrollable() const; int scroll_length() const; - void set_scroll_length(int); size_t max_history_size() const { return m_terminal.max_history_size(); } void set_max_history_size(size_t value) { m_terminal.set_max_history_size(value); }