Minor fixes
This commit is contained in:
parent
97de5af838
commit
26d6448076
|
|
@ -39,6 +39,7 @@
|
||||||
#include <Nazara/Widgets/ImageWidget.hpp>
|
#include <Nazara/Widgets/ImageWidget.hpp>
|
||||||
#include <Nazara/Widgets/LabelWidget.hpp>
|
#include <Nazara/Widgets/LabelWidget.hpp>
|
||||||
#include <Nazara/Widgets/RichTextAreaWidget.hpp>
|
#include <Nazara/Widgets/RichTextAreaWidget.hpp>
|
||||||
|
#include <Nazara/Widgets/SimpleWidgetStyles.hpp>
|
||||||
#include <Nazara/Widgets/TextAreaWidget.hpp>
|
#include <Nazara/Widgets/TextAreaWidget.hpp>
|
||||||
#include <Nazara/Widgets/Widgets.hpp>
|
#include <Nazara/Widgets/Widgets.hpp>
|
||||||
#include <Nazara/Widgets/WidgetTheme.hpp>
|
#include <Nazara/Widgets/WidgetTheme.hpp>
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@ namespace Nz
|
||||||
assert(glyphCount > 0);
|
assert(glyphCount > 0);
|
||||||
|
|
||||||
std::size_t startIndex = GetCharacterPosition(m_text, GetGlyphIndex(selectionBegin));
|
std::size_t startIndex = GetCharacterPosition(m_text, GetGlyphIndex(selectionBegin));
|
||||||
std::size_t endIndex = GetCharacterPosition(m_text, std::min(GetGlyphIndex(selectionEnd), glyphCount - 1));
|
std::size_t endIndex = GetCharacterPosition(m_text, std::min(GetGlyphIndex(selectionEnd), glyphCount));
|
||||||
|
|
||||||
Clipboard::SetString(m_text.substr(startIndex, endIndex - startIndex));
|
Clipboard::SetString(m_text.substr(startIndex, endIndex - startIndex));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@ namespace Nz
|
||||||
m_opaqueMaterial->AddPass("ForwardPass", m_opaqueMaterialPass);
|
m_opaqueMaterial->AddPass("ForwardPass", m_opaqueMaterialPass);
|
||||||
|
|
||||||
m_transparentMaterialPass = std::make_shared<MaterialPass>(BasicMaterial::GetSettings());
|
m_transparentMaterialPass = std::make_shared<MaterialPass>(BasicMaterial::GetSettings());
|
||||||
m_transparentMaterialPass->EnableFlag(MaterialPassFlag::Transparent);
|
|
||||||
m_transparentMaterialPass->EnableDepthBuffer(true);
|
m_transparentMaterialPass->EnableDepthBuffer(true);
|
||||||
m_transparentMaterialPass->EnableDepthWrite(false);
|
m_transparentMaterialPass->EnableDepthWrite(false);
|
||||||
m_transparentMaterialPass->EnableBlending(true);
|
m_transparentMaterialPass->EnableBlending(true);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue