Skip to content

Commit

Permalink
Fixes after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@midwan
midwan committed Sep 4, 2024
1 parent c74d1cb commit 97830bc
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions include/guisan/mouseevent.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
* Olof Naess�n a.k.a jansem/yakslem _asww7!uY`> )\a//
* Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
Expand Down Expand Up @@ -68,7 +68,7 @@ namespace gcn
/**
* Represents a mouse event.
*
* @author Olof Naess�n
* @author Olof Naessén
* @since 0.6.0
*/
class GCN_CORE_DECLSPEC MouseEvent: public InputEvent
Expand Down
4 changes: 2 additions & 2 deletions include/guisan/opengl/openglgraphics.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
* Olof Naess�n a.k.a jansem/yakslem _asww7!uY`> )\a//
* Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
Expand Down
4 changes: 2 additions & 2 deletions include/guisan/widgets/dropdown.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
* Olof Naess�n a.k.a jansem/yakslem _asww7!uY`> )\a//
* Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
Expand Down
4 changes: 2 additions & 2 deletions include/guisan/widgets/listbox.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
* Olof Naess�n a.k.a jansem/yakslem _asww7!uY`> )\a//
* Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
Expand Down
14 changes: 7 additions & 7 deletions src/basiccontainer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,15 @@ namespace gcn
{
// If the widget has a frame,
// draw it before drawing the widget
if ((*iter)->getFrameSize() > 0)
if (mWidget->getFrameSize() > 0)
{
Rectangle rec = (*iter)->getDimension();
rec.x -= (*iter)->getFrameSize();
rec.y -= (*iter)->getFrameSize();
rec.width += 2 * (*iter)->getFrameSize();
rec.height += 2 * (*iter)->getFrameSize();
Rectangle rec = mWidget->getDimension();
rec.x -= mWidget->getFrameSize();
rec.y -= mWidget->getFrameSize();
rec.width += 2 * mWidget->getFrameSize();
rec.height += 2 * mWidget->getFrameSize();
graphics->pushClipArea(rec);
(*iter)->drawFrame(graphics);
mWidget->drawFrame(graphics);
graphics->popClipArea();
}

Expand Down
4 changes: 2 additions & 2 deletions src/opengl/openglgraphics.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
* Olof Naess�n a.k.a jansem/yakslem _asww7!uY`> )\a//
* Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/tabbedarea.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,9 @@ namespace gcn
int maxTabHeight = 0;
for (unsigned int i = 0; i < mTabs.size(); i++)
{
if (mTab.first->getHeight() > maxTabHeight)
if (mTabs[i].first->getHeight() > maxTabHeight)
{
maxTabHeight = mTab.first->getHeight();
maxTabHeight = mTabs[i].first->getHeight();
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/widgets/togglebutton.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
* Copyright (c) 2020 Gwilherm Baudic
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
* Olof Naess�n a.k.a jansem/yakslem _asww7!uY`> )\a//
* Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
Expand Down

0 comments on commit 97830bc

Please sign in to comment.