mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-16 00:34:19 +00:00
Removed the (rather pointless) granularity value from the array objects. Converted a few macros into functions and other misc code clean-ups.
This commit is contained in:
parent
c368805559
commit
97035bb3a1
69 changed files with 218 additions and 369 deletions
|
|
@ -79,17 +79,17 @@ public:
|
|||
const Colour& colour_,
|
||||
const tchar passwordCharacter)
|
||||
: font (font_),
|
||||
colour (colour_),
|
||||
atoms (64)
|
||||
colour (colour_)
|
||||
{
|
||||
initialiseAtoms (text, passwordCharacter);
|
||||
}
|
||||
|
||||
UniformTextSection (const UniformTextSection& other)
|
||||
: font (other.font),
|
||||
colour (other.colour),
|
||||
atoms (64)
|
||||
colour (other.colour)
|
||||
{
|
||||
atoms.ensureStorageAllocated (other.atoms.size());
|
||||
|
||||
for (int i = 0; i < other.atoms.size(); ++i)
|
||||
atoms.add (new TextAtom (*(const TextAtom*) other.atoms.getUnchecked(i)));
|
||||
}
|
||||
|
|
@ -141,6 +141,8 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
atoms.ensureStorageAllocated (atoms.size() + other.atoms.size() - i);
|
||||
|
||||
while (i < other.atoms.size())
|
||||
{
|
||||
atoms.add (other.getAtom(i));
|
||||
|
|
@ -990,10 +992,8 @@ TextEditor::TextEditor (const String& name,
|
|||
currentFont (14.0f),
|
||||
totalNumChars (0),
|
||||
caretPosition (0),
|
||||
sections (8),
|
||||
passwordCharacter (passwordCharacter_),
|
||||
dragType (notDragging),
|
||||
listeners (2)
|
||||
dragType (notDragging)
|
||||
{
|
||||
setOpaque (true);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue