Disallow non-digits in size test (issue #64)

Only allow decimal digits in text control for size test.
HaikuArchives · Jul 19, 2017 · 3e99669 · 3e99669
1 parent 4432990
commit 3e99669
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/sources/AutoTextControl.cpp b/sources/AutoTextControl.cpp
@@ -41,6 +41,7 @@ AutoTextControl::AutoTextControl(const char* name, const char* label,
 	:
 	BTextControl(name, label, text, msg, flags),
 	fEmpty(false),
+	fOnlyDigits(false),
  	fFilter(NULL),
  	fCharLimit(0)
 {
@@ -195,6 +196,25 @@ AutoTextControl::GetCharacterLimit(const uint32& limit)
 }
 
 
+void
+AutoTextControl::OnlyAllowDigits(bool turnOn)
+{
+	if (fOnlyDigits == turnOn)
+		return;
+
+	fOnlyDigits = turnOn;
+	BTextView* view = TextView();
+	void (BTextView::*f)(uint32 byte) = turnOn ? &BTextView::DisallowChar
+												: &BTextView::AllowChar;
+
+	for (uint32 i = 0; i < '0'; i++)
+		(view->*f)(i);
+
+	for (uint32 i = '9' + 1; i < 256; i++)
+		(view->*f)(i);
+}
+
+
 void
 AutoTextControl::SetFilter(AutoTextControlFilter* filter)
 {

diff --git a/sources/AutoTextControl.h b/sources/AutoTextControl.h
@@ -51,13 +51,16 @@ class AutoTextControl : public BTextControl
 
 			void	SetCharacterLimit(const uint32& limit);
 			uint32	GetCharacterLimit(const uint32& limit);
+
+			void	OnlyAllowDigits(bool turnOn);
 
 private:
 	friend AutoTextControlFilter;
 
 	AutoTextControlFilter*	fFilter;
 	uint32					fCharLimit;
 	bool					fEmpty;
+	bool					fOnlyDigits;
 };
 
 /*

diff --git a/sources/TestView.cpp b/sources/TestView.cpp
@@ -362,10 +362,14 @@ TestView::SetTest()
 	STRACE(("-------------------------\n"));
 
 	if (fDataType == TEST_TYPE_NUMBER) {
+		fValueBox->OnlyAllowDigits(true);
 		if (fUnitField->IsHidden())
 			fUnitField->Show();
-	} else if (!fUnitField->IsHidden())
+	} else {
+		fValueBox->OnlyAllowDigits(false);
+		if (!fUnitField->IsHidden())
 			fUnitField->Hide();
+	}
 }