Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accessibility three: Turn the documentation into a TextEd #42

Merged
merged 1 commit into from
Apr 27, 2024
Merged

Accessibility three: Turn the documentation into a TextEd #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 26 additions & 41 deletions src-juce/AWConsolidatedEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,54 +315,48 @@ struct AWLink : public juce::Component
struct DocPanel : juce::Component
{
AWConsolidatedAudioProcessorEditor *editor{nullptr};
std::unique_ptr<juce::TextEditor> docBodyEd;
DocPanel(AWConsolidatedAudioProcessorEditor *ed) : editor(ed)
{
setAccessible(true);
setWantsKeyboardFocus(true);

docBodyEd = std::make_unique<juce::TextEditor>("Documentation");
docBodyEd->setMultiLine(true);
docBodyEd->setFont(juce::Font(editor->jakartaSansMedium).withHeight(15));
docBodyEd->setReadOnly(true);
docBodyEd->setAccessible(true);
docBodyEd->setTitle("Documentation");
docBodyEd->setColour(juce::TextEditor::ColourIds::backgroundColourId,
juce::Colours::black.withAlpha(0.f));
docBodyEd->setColour(juce::TextEditor::ColourIds::outlineColourId,
juce::Colours::black.withAlpha(0.f));
docBodyEd->setColour(juce::TextEditor::ColourIds::textColourId, juce::Colours::white);
docBodyEd->setIndents(0, 0);
addAndMakeVisible(*docBodyEd);
}

void rebuild()
{
auto r = juce::Rectangle<int>(0, 0, targetWidth, 10000);
auto r = getLocalBounds();

auto tFont = juce::Font(editor->jakartaSansSemi).withHeight(18);
juce::GlyphArrangement gaTitle;
gaTitle.addFittedText(tFont, editor->docHeader.substring(2), r.getX(), r.getY(),
r.getWidth(), r.getHeight(), juce::Justification::topLeft, 3);
auto bounds = gaTitle.getBoundingBox(0, -1, true);

auto q = r.translated(0, bounds.getHeight() + 8);

auto bFont = juce::Font(editor->jakartaSansSemi).withHeight(15);
juce::GlyphArrangement gaBody;
gaBody.addFittedText(bFont, editor->docString.trim(), q.getX(), q.getY(), q.getWidth(),
q.getHeight(), juce::Justification::topLeft, 1000);
auto bodyBounds = gaBody.getBoundingBox(0, -1, true);
r = r.withHeight(bodyBounds.getBottom());
auto q = r.withTrimmedTop(bounds.getHeight() + 8);

setSize(r.getWidth(), r.getHeight());
docBodyEd->setBounds(q);
docBodyEd->setText(editor->docString, false);

setTitle(AirwinRegistry::registry[editor->processor.curentProcessorIndex].name +
" Documentation. Control R to read");
setTitle(editor->docHeader.substring(2));
if (getAccessibilityHandler())
getAccessibilityHandler()->notifyAccessibilityEvent(
juce::AccessibilityEvent::titleChanged);
}

float targetWidth{10};

bool keyPressed(const juce::KeyPress &key) override
{
if ((key.getKeyCode() == 'r' || key.getKeyCode() == 'R') &&
(key.getModifiers().isCommandDown() || key.getModifiers().isCtrlDown()))
{
getAccessibilityHandler()->postAnnouncement(
editor->docHeader.substring(2) + "." + editor->docString,
juce::AccessibilityHandler::AnnouncementPriority::medium);
return true;
}
return false;
}

void paint(juce::Graphics &g) override
{
g.setColour(juce::Colours::white);
Expand All @@ -378,16 +372,9 @@ struct DocPanel : juce::Component
g.setColour(juce::Colour(120, 120, 125));
g.drawLine(r.getX(), r.getY(), r.getX() + r.getWidth(), r.getY());
r = r.translated(0, 4);

g.setColour(juce::Colours::white.darker(0.3f));

auto q = r;
auto bFont = juce::Font(editor->jakartaSansMedium).withHeight(15);
juce::GlyphArrangement gaBody;
gaBody.addFittedText(bFont, editor->docString.trim(), q.getX(), q.getY(), q.getWidth(),
q.getHeight(), juce::Justification::topLeft, 1000);
gaBody.draw(g);
}

void resized() override { rebuild(); }
};

struct ParamKnob : juce::Component
Expand Down Expand Up @@ -704,14 +691,11 @@ AWConsolidatedAudioProcessorEditor::AWConsolidatedAudioProcessorEditor(
.withTrimmedTop(60 + 2 * margin)
.withTrimmedBottom(40 + margin);

da->targetWidth = db.getWidth() - 10;
da->rebuild();
docArea = std::move(da);

docView = std::make_unique<juce::Viewport>();
docView->setBounds(db);
docView->setViewedComponent(docArea.get(), false);
addAndMakeVisible(*docView);
addAndMakeVisible(*docArea);
docArea->setBounds(db);

awTag = std::make_unique<AWLink>(jakartaSansSemi);
auto fa = getLocalBounds()
Expand All @@ -729,6 +713,7 @@ AWConsolidatedAudioProcessorEditor::AWConsolidatedAudioProcessorEditor(
for (auto &k : knobs)
accessibleOrderWeakRefs.push_back(k.get());
accessibleOrderWeakRefs.push_back(docArea.get());
accessibleOrderWeakRefs.push_back(docArea->docBodyEd.get());

juce::PropertiesFile::Options options;
options.applicationName = "AirwindowsConsolidated";
Expand Down
1 change: 0 additions & 1 deletion src-juce/AWConsolidatedEditor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ class AWConsolidatedAudioProcessorEditor : public juce::AudioProcessorEditor, ju
std::unique_ptr<juce::Component> awTag;

std::unique_ptr<DocPanel> docArea;
std::unique_ptr<juce::Viewport> docView;

juce::String docString, docHeader;

Expand Down
Loading