perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a bug in the FObject check of parent objects

This commit is contained in:
Markus Gans 2017-10-14 20:21:44 +02:00
parent b4b84225d5
commit 9e0b6f8b53
5 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2017-10-02 Markus Gans <guru.mail@muenster.de>
* Fixed a bug in the FObject check of parent objects
2017-10-02 Markus Gans <guru.mail@muenster.de> 2017-10-02 Markus Gans <guru.mail@muenster.de>
* DECSCUSR - Set Cursor Style support for VTE >= 0.40.0 and * DECSCUSR - Set Cursor Style support for VTE >= 0.40.0 and
gnome-terminal >= 3.16 gnome-terminal >= 3.16

56
include/final/final.h
View File

@ -23,33 +23,33 @@
#ifndef FINAL_H #ifndef FINAL_H
#define FINAL_H #define FINAL_H
#include "fapplication.h" #include <final/fapplication.h>
#include "fbuttongroup.h" #include <final/fbuttongroup.h>
#include "fbutton.h" #include <final/fbutton.h>
#include "fcheckbox.h" #include <final/fcheckbox.h>
#include "fcheckmenuitem.h" #include <final/fcheckmenuitem.h>
#include "fdialog.h" #include <final/fdialog.h>
#include "fdialoglistmenu.h" #include <final/fdialoglistmenu.h>
#include "ffiledialog.h" #include <final/ffiledialog.h>
#include "flabel.h" #include <final/flabel.h>
#include "flineedit.h" #include <final/flineedit.h>
#include "flistbox.h" #include <final/flistbox.h>
#include "fmenubar.h" #include <final/fmenubar.h>
#include "fmenu.h" #include <final/fmenu.h>
#include "fmenuitem.h" #include <final/fmenuitem.h>
#include "fmessagebox.h" #include <final/fmessagebox.h>
#include "fpoint.h" #include <final/fpoint.h>
#include "fprogressbar.h" #include <final/fprogressbar.h>
#include "fradiobutton.h" #include <final/fradiobutton.h>
#include "fradiomenuitem.h" #include <final/fradiomenuitem.h>
#include "frect.h" #include <final/frect.h>
#include "fscrollbar.h" #include <final/fscrollbar.h>
#include "fstatusbar.h" #include <final/fstatusbar.h>
#include "fstring.h" #include <final/fstring.h>
#include "fswitch.h" #include <final/fswitch.h>
#include "fterm.h" #include <final/fterm.h>
#include "ftextview.h" #include <final/ftextview.h>
#include "ftooltip.h" #include <final/ftooltip.h>
#include "fwidget.h" #include <final/fwidget.h>
#endif // FINAL_H #endif // FINAL_H

5
include/final/fobject.h
View File

@ -189,7 +189,10 @@ inline bool FObject::isTimerInUpdating() const
//---------------------------------------------------------------------- //----------------------------------------------------------------------
inline void FObject::removeParent() inline void FObject::removeParent()
{ parent_obj = 0; } {
parent_obj = 0;
has_parent = false;
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------

2
src/fmenu.cpp
View File

@ -1346,7 +1346,7 @@ void FMenu::drawItems()
if ( getEncoding() == "ASCII" ) if ( getEncoding() == "ASCII" )
print ('-'); print ('-');
else else
print (fc::SmallBullet); print (fc::SmallBullet); // ·
setColor(); setColor();
} }

2
src/fobject.cpp
View File

@ -154,7 +154,7 @@ void FObject::addChild (FObject* obj)
obj->parent_obj->delChild(obj); obj->parent_obj->delChild(obj);
obj->parent_obj = this; obj->parent_obj = this;
obj->has_parent = true;
children_list.push_back(obj); children_list.push_back(obj);
} }