aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPo Lu2022-06-11 11:55:42 +0000
committerPo Lu2022-06-11 12:01:21 +0000
commitab63000b6add129f270bb7787abc75efefa76ffe (patch)
treecc3d9f28d3b4c9d39a104f1ee902ef9b2a8a0c84
parent4881ce7a746d95e702d7328689949b2ae4931692 (diff)
downloademacs-ab63000b6add129f270bb7787abc75efefa76ffe.tar.gz
emacs-ab63000b6add129f270bb7787abc75efefa76ffe.zip
Fix initializers for Haiku scroll bars
* src/haiku_support.cc (class Emacs): (class EmacsScrollBar): Fix initializers.
-rw-r--r--src/haiku_support.cc26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index 3c8e5dc8c2e..bc82069789b 100644
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -582,10 +582,11 @@ class Emacs : public BApplication
582{ 582{
583public: 583public:
584 BMessage settings; 584 BMessage settings;
585 bool settings_valid_p = false; 585 bool settings_valid_p;
586 EmacsScreenChangeMonitor *monitor; 586 EmacsScreenChangeMonitor *monitor;
587 587
588 Emacs (void) : BApplication ("application/x-vnd.GNU-emacs") 588 Emacs (void) : BApplication ("application/x-vnd.GNU-emacs"),
589 settings_valid_p (false)
589 { 590 {
590 BPath settings_path; 591 BPath settings_path;
591 592
@@ -1948,26 +1949,31 @@ public:
1948class EmacsScrollBar : public BScrollBar 1949class EmacsScrollBar : public BScrollBar
1949{ 1950{
1950public: 1951public:
1951 int dragging = 0; 1952 int dragging;
1952 bool horizontal; 1953 bool horizontal;
1953 enum haiku_scroll_bar_part current_part; 1954 enum haiku_scroll_bar_part current_part;
1954 float old_value; 1955 float old_value;
1955 scroll_bar_info info; 1956 scroll_bar_info info;
1956 1957
1957 /* True if button events should be passed to the parent. */ 1958 /* True if button events should be passed to the parent. */
1958 bool handle_button = false; 1959 bool handle_button;
1959 bool in_overscroll = false; 1960 bool in_overscroll;
1960 bool can_overscroll = false; 1961 bool can_overscroll;
1961 bool maybe_overscroll = false; 1962 bool maybe_overscroll;
1962 BPoint last_overscroll; 1963 BPoint last_overscroll;
1963 int last_reported_overscroll_value; 1964 int last_reported_overscroll_value;
1964 int max_value, real_max_value; 1965 int max_value, real_max_value;
1965 int overscroll_start_value; 1966 int overscroll_start_value;
1966 bigtime_t repeater_start; 1967 bigtime_t repeater_start;
1967 1968
1968 EmacsScrollBar (int x, int y, int x1, int y1, bool horizontal_p) : 1969 EmacsScrollBar (int x, int y, int x1, int y1, bool horizontal_p)
1969 BScrollBar (BRect (x, y, x1, y1), NULL, NULL, 0, 0, horizontal_p ? 1970 : BScrollBar (BRect (x, y, x1, y1), NULL, NULL, 0, 0, horizontal_p ?
1970 B_HORIZONTAL : B_VERTICAL) 1971 B_HORIZONTAL : B_VERTICAL),
1972 dragging (0),
1973 handle_button (false),
1974 in_overscroll (false),
1975 can_overscroll (false),
1976 maybe_overscroll (false)
1971 { 1977 {
1972 BView *vw = (BView *) this; 1978 BView *vw = (BView *) this;
1973 vw->SetResizingMode (B_FOLLOW_NONE); 1979 vw->SetResizingMode (B_FOLLOW_NONE);